Caching only the fanouts sections (reverted from commit e613129ad902b25dcc11b9b0c77fe3e1b6213233)