Remove cache invalidators
Simplify storage_factory_factory