[ENH] Fanouts caching, merge some upstream stuff