Service Manager: Miscellaneous catalog cleanup

services/catalog/catalog.h

Index: services/catalog/catalog.h
diff --git a/services/catalog/catalog.h b/services/catalog/catalog.h
index 691139c8341882e2a5f7c743e6a73f07969e043d..0913895961db3aba39afea8b26df77424b99f832 100644
--- a/services/catalog/catalog.h
+++ b/services/catalog/catalog.h
@@ -15,7 +15,6 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/catalog/types.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/resolver.mojom.h"
@@ -37,6 +36,7 @@ class ServiceContext;
 
 namespace catalog {
 
+class EntryCache;
 class Instance;
 class ManifestProvider;
 class Reader;
@@ -111,7 +111,7 @@ class Catalog
   std::map<std::string, std::unique_ptr<Instance>> instances_;
 
   std::unique_ptr<Reader> system_reader_;
-  EntryCache system_cache_;
+  const std::unique_ptr<EntryCache> system_cache_;
   bool loaded_ = false;
 
   scoped_refptr<filesystem::LockTable> lock_table_;