fixed CachedNeighborFinder