Added back in name cache but force it to only store entries if they have a valid Indexer ID otherwise disgard them.