diff --git a/.taskcluster.yml b/.taskcluster.yml
index 098a1414fe7..2dbaed6cd2b 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -28,7 +28,7 @@ tasks:
           # Granted to role "repo:github.com/servo/servo:branch:*"
           - "queue:create-task:highest:aws-provisioner-v1/servo-*"
           - "queue:route:index.project.servo.servo.*"
-          - "docker-worker:cache:cargo-*"
+          - "docker-worker:cache:servo-*"
 
         payload:
           maxRunTime: {$eval: '20 * 60'}
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 24aa16ac629..aa3c5d0723f 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -249,13 +249,13 @@ def linux_build_task(name):
     return (
         linux_task(name)
         # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/caches
-        # FIMXE: move to servo-* cache names
-        .with_scopes("docker-worker:cache:cargo-*")
+        .with_scopes("docker-worker:cache:servo-*")
         .with_caches(**{
-            "cargo-registry-cache": "/root/.cargo/registry",
-            "cargo-git-cache": "/root/.cargo/git",
-            "cargo-rustup": "/root/.rustup",
-            "cargo-sccache": "/root/.cache/sccache",
+            "servo-cargo-registry": "/root/.cargo/registry",
+            "servo-cargo-git": "/root/.cargo/git",
+            "servo-rustup": "/root/.rustup",
+            "servo-sccache": "/root/.cache/sccache",
+            "servo-gradle": "/root/.gradle",
         })
         .with_index_and_artifacts_expire_in(build_artifacts_expire_in)
         .with_max_run_time_minutes(60)