Additional Indexer cache testing and fixes.