fixed includes, fixed getHash for CachedNeighborFinder