[21:40:26] xSavitar: Regarding ObjectCacheFactory, it might simplify the refactor if we didn't need `ObjectCache::$instances` compat. Do you think it's feasible to remove that? It seems like the callers are limited to 1 or 2 tests (no prod code), and could perhaps be migrated to changing $wgObjectCache instead (I believe we already call ObjectCache::clear between tests, right?), or to DI what they need directly to where they need it.