[ENH] New fanout caching - cleanup