Issue #3162827 by Berdir, Spokje, claudiu.cristea, daffie: Do not instantiate entity storages in constructors of services that do not always need them