--- a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
@@ -4,23 +4,21 @@ task:
   metadata:
     name: "[TC] B2G Desktop {{build_type}}"
     description: B2G Desktop {{build_type}}
 
   workerType: b2gbuild-desktop
   scopes:
     - 'docker-worker:cache:sources-gecko'
     - 'docker-worker:cache:sources-gaia'
-    - 'docker-worker:cache:build-b2g-desktop-objects'
 
   payload:
     cache:
       sources-gaia: '/home/worker/gaia'
       sources-gecko: '/home/worker/gecko'
-      build-b2g-desktop-objects: '/home/worker/object-folder'
 
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
       MOZTT_GIT_URL: '{{moztt_git_url}}'
       MOZTT_REVISION: '{{moztt_revision}}'
 
     command:
       - bin/build-b2g-desktop.sh

--- a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
@@ -1,14 +1,21 @@
 $inherits:
   from: 'tasks/builds/b2g_desktop_base.yml'
   variables:
     build_type: 'debug'
 
 task:
+  scopes:
+      - 'docker-worker:cache:build-b2g-desktop-objects-debug'
+
+  payload:
+    cache:
+        build-b2g-desktop-objects-debug: '/home/worker/object-folder'
+
   extra:
     treeherder:
       collection:
         debug: true
 
   payload:
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/debug'

--- a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml
@@ -1,9 +1,16 @@
 $inherits:
   from: 'tasks/builds/b2g_desktop_base.yml'
   variables:
     build_type: 'opt'
 
 task:
+  scopes:
+      - 'docker-worker:cache:build-b2g-desktop-objects-opt'
+
+  payload:
+    cache:
+        build-b2g-desktop-objects-opt: '/home/worker/object-folder'
+
   payload:
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'