merge-recursive: handle NULL in add_cacheinfo() correctly