squash with caches
squash with test
get_fast_modinfo is back in phpunit reset
MDL-34397 Changes to caching