[CLEANUP] even more cleanup for fanouts caching (reverted from commit 1296e7dc742d3d4fb083a92e942eeac15ceacd20)