[CLEANUP] even more cleanup for fanouts caching