diff --git a/libraries/model-baker/src/model-baker/Baker.cpp b/libraries/model-baker/src/model-baker/Baker.cpp
index 344af1ba8a..fc27756877 100644
--- a/libraries/model-baker/src/model-baker/Baker.cpp
+++ b/libraries/model-baker/src/model-baker/Baker.cpp
@@ -178,8 +178,13 @@ namespace baker {
 
     void Baker::run() {
         _engine->run();
-        hfmModel = _engine->getOutput().get<BakerEngineBuilder::Output>().get0();
-        materialMapping = _engine->getOutput().get<BakerEngineBuilder::Output>().get1();
     }
 
+    hfm::Model::Pointer Baker::getHFMModel() const {
+        return _engine->getOutput().get<BakerEngineBuilder::Output>().get0();
+    }
+    
+    MaterialMapping Baker::getMaterialMapping() const {
+        return _engine->getOutput().get<BakerEngineBuilder::Output>().get1();
+    }
 };
diff --git a/libraries/model-baker/src/model-baker/Baker.h b/libraries/model-baker/src/model-baker/Baker.h
index 542be0b559..1880aba618 100644
--- a/libraries/model-baker/src/model-baker/Baker.h
+++ b/libraries/model-baker/src/model-baker/Baker.h
@@ -28,8 +28,8 @@ namespace baker {
         void run();
 
         // Outputs, available after run() is called
-        hfm::Model::Pointer hfmModel;
-        MaterialMapping materialMapping;
+        hfm::Model::Pointer getHFMModel() const;
+        MaterialMapping getMaterialMapping() const;
 
     protected:
         EnginePointer _engine;
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 581196b2cc..1d0032ee4c 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -341,8 +341,8 @@ void GeometryDefinitionResource::setGeometryDefinition(HFMModel::Pointer hfmMode
     modelBaker.run();
 
     // Assume ownership of the processed HFMModel
-    _hfmModel = modelBaker.hfmModel;
-    _materialMapping = modelBaker.materialMapping;
+    _hfmModel = modelBaker.getHFMModel();
+    _materialMapping = modelBaker.getMaterialMapping();
 
     // Copy materials
     QHash<QString, size_t> materialIDAtlas;