[CLEANUP] More Cleanup for fanouts caching