create feature _cache to store matches per entity
also remove old commented code