diff --git a/plugins/commands/serve/mappers/basis.rb b/plugins/commands/serve/mappers/basis.rb
index f42ccb549..3274d7f67 100644
--- a/plugins/commands/serve/mappers/basis.rb
+++ b/plugins/commands/serve/mappers/basis.rb
@@ -31,8 +31,8 @@ module VagrantPlugins
         end
 
         def converter(proto, broker, cacher)
-          cid = proto.addr.to_s if proto.addr.to_s != ""
-          return cacher[cid] if cid && cacher.registered?(cid)
+          cid = proto.target.to_s if proto.target.to_s != ""
+          return cacher[cid].value if cid && cacher.registered?(cid)
 
           project = Client::Basis.load(proto, broker: broker)
           cacher[cid] = project if cid
diff --git a/plugins/commands/serve/mappers/environment.rb b/plugins/commands/serve/mappers/environment.rb
index ee169ebee..8445594d8 100644
--- a/plugins/commands/serve/mappers/environment.rb
+++ b/plugins/commands/serve/mappers/environment.rb
@@ -15,7 +15,7 @@ module VagrantPlugins
 
         def converter(project, ui, cacher)
           cid = project.resource_id
-          return cacher[cid] if cacher.registered?(cid)
+          return cacher[cid].value if cacher.registered?(cid)
           logger.warn("cache miss for environment with project resource id #{cid} cache=#{cacher} !!")
           env = Vagrant::Environment.new(ui: ui, client: project)
           cacher[cid] = env
@@ -37,7 +37,7 @@ module VagrantPlugins
 
         def converter(project, cacher, mapper)
           cid = project.resource_id
-          return cacher[cid] if cacher.registered?(cid)
+          return cacher[cid].value if cacher.registered?(cid)
           logger.warn("cache miss for environment with project resource id #{cid} cache=#{cacher}")
           ui = mapper.map(project, to: Vagrant::UI::Remote)
           env = Vagrant::Environment.new(client: project, ui: ui)
diff --git a/plugins/commands/serve/mappers/project.rb b/plugins/commands/serve/mappers/project.rb
index e75123eae..ebd169c95 100644
--- a/plugins/commands/serve/mappers/project.rb
+++ b/plugins/commands/serve/mappers/project.rb
@@ -49,8 +49,8 @@ module VagrantPlugins
         end
 
         def converter(proto, broker, cacher)
-          cid = proto.addr.to_s if proto.addr.to_s != ""
-          return cacher[cid] if cid && cacher.registered?(cid)
+          cid = proto.target.to_s if proto.target.to_s != ""
+          return cacher[cid].value if cid && cacher.registered?(cid)
 
           project = Client::Project.load(proto, broker: broker)
           cacher[cid] = project if cid
diff --git a/plugins/commands/serve/mappers/synced_folder.rb b/plugins/commands/serve/mappers/synced_folder.rb
index 99adba958..b09afea50 100644
--- a/plugins/commands/serve/mappers/synced_folder.rb
+++ b/plugins/commands/serve/mappers/synced_folder.rb
@@ -41,8 +41,8 @@ module VagrantPlugins
         end
 
         def converter(proto, broker, cacher)
-          cid = proto.addr.to_s if proto.addr.to_s != ""
-          return cacher[cid] if cid && cacher.registered?(cid)
+          cid = proto.target.to_s if proto.target.to_s != ""
+          return cacher[cid].value if cid && cacher.registered?(cid)
 
           project = Client::SyncedFolder.load(proto, broker: broker)
           cacher[cid] = project if cid
diff --git a/plugins/commands/serve/util/cacher.rb b/plugins/commands/serve/util/cacher.rb
index a0a62aea6..be23d87ed 100644
--- a/plugins/commands/serve/util/cacher.rb
+++ b/plugins/commands/serve/util/cacher.rb
@@ -7,7 +7,6 @@ module VagrantPlugins
         include Mutex_m
 
         class Entry
-          include Mutex_m
           attr_reader :value
 
           def initialize(value)
@@ -16,7 +15,6 @@ module VagrantPlugins
           end
 
           def value
-            raise "Entry must be locked to access value" if !mu_locked?
             @value
           end
         end