Revert "[recipes] Use named caches for git and workdirs"

This reverts commit e8615f969e92009551b70c85d1913202390e0b0d.

Reason for revert: Causing CommandBuffer builds to time out

Original change's description:
> [recipes] Use named caches for git and workdirs
>
> Bug: skia:
> Change-Id: Iaf3d190252c9483c8b9e58a3ab0305db4173cc1c
> Reviewed-on: https://skia-review.googlesource.com/123929
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>

----------------

Revert "[infra] Fix missing cache for Bookmaker"

This reverts commit d19f039a16cc4ed29dc6f0ef7100125819ca291d.

Reason for revert: Need to revert https://skia-review.googlesource.com/123929

Original change's description:
> [infra] Fix missing cache for Bookmaker
>
> Bug: skia:
> Change-Id: I12d42fa1bb364ea6c75865f72143daf92b8c12c3
> Reviewed-on: https://skia-review.googlesource.com/124052
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>

----------------

Revert "Fix missing/duplicate named caches"

This reverts commit 0820a6fb697be598b41b65c7645659e216b30bc5.

Reason for revert: Need to revert https://skia-review.googlesource.com/123929

Original change's description:
> Fix missing/duplicate named caches
>
> Fixes issue with https://skia-review.googlesource.com/c/skia/+/123929
>
> No-Try: true
> Change-Id: I582b2bba67b8b257f35c5b85ccfe6e6304ff7a7c
> Reviewed-on: https://skia-review.googlesource.com/124180
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>

----------------

TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com

Change-Id: Id8443ad9dc50f018251a6b6892b06fe256e6c578
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/124203
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

1 files changed, 0 insertions, 6758 deletions

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 34c5e97c1a..5ef9b0c712 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -3428,24 +3428,6 @@
   },
   "tasks": {
     "Build-Debian9-Clang-arm-Debug-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -3553,24 +3535,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Debug-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -3678,24 +3642,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Debug-Chromebook_GLES": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -3817,24 +3763,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -3942,24 +3870,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Release-Android_API26": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4067,24 +3977,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Release-Android_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4192,24 +4084,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4317,24 +4191,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Release-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4442,24 +4298,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm-Release-Chromebook_GLES": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4581,24 +4419,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm64-Debug-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4706,24 +4526,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm64-Debug-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4831,24 +4633,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm64-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -4956,24 +4740,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm64-Release-Android_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5081,24 +4847,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5206,24 +4954,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-arm64-Release-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5331,12 +5061,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-gce_x86_phone-eng-Android_Framework": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5427,24 +5151,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x64-Debug-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5552,24 +5258,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x64-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5677,24 +5365,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5806,24 +5476,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86-Debug-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -5931,24 +5583,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86-Debug-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6056,24 +5690,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6181,24 +5797,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86-Release-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6306,24 +5904,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6435,24 +6015,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6564,24 +6126,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6698,24 +6242,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6832,24 +6358,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -6961,24 +6469,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-MSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7090,24 +6580,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7219,24 +6691,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-SafeStack": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7348,24 +6802,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-SwiftShader": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7482,24 +6918,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7616,24 +7034,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7750,24 +7150,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -7879,24 +7261,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8008,24 +7372,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8137,24 +7483,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8271,24 +7599,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-Chromebook_GLES": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8405,24 +7715,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-Fast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8534,24 +7826,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-Mini": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8663,20 +7937,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-NoDEPS": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8788,24 +8048,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-ParentRevision": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -8917,24 +8159,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9046,24 +8270,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9175,24 +8381,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9304,24 +8492,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9433,24 +8603,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-SwiftShader": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9567,24 +8719,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9696,24 +8830,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9830,24 +8946,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-Clang-x86_64-Release-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -9964,24 +9062,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-EMCC-wasm-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10093,24 +9173,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-arm-Debug-Chromecast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10227,24 +9289,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-arm-Release-Chromecast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10361,24 +9405,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-loongson3a-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10490,24 +9516,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-loongson3a-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10619,24 +9627,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-mips64el-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10748,24 +9738,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-mips64el-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -10877,24 +9849,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11001,24 +9955,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11125,24 +10061,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11249,24 +10167,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Debug-EmbededResouces": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11373,24 +10273,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Debug-NoGPU": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11497,24 +10379,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11621,24 +10485,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-EmbededResouces": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11745,24 +10591,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-Flutter_Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11870,24 +10698,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-NoGPU": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -11994,24 +10804,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-PDFium": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12118,24 +10910,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12242,24 +11016,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12366,24 +11122,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Debian9-GCC-x86_64-Release-Shared": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12490,24 +11228,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-arm-Debug-iOS": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12614,24 +11334,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-arm-Release-iOS": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12738,24 +11440,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-arm64-Debug-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12867,24 +11551,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-arm64-Debug-iOS": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -12991,24 +11657,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-arm64-Release-iOS": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13115,24 +11763,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x64-Release-iOS": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13239,24 +11869,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13363,24 +11975,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Debug-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13487,24 +12081,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13611,24 +12187,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Debug-Metal": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13735,24 +12293,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13859,24 +12399,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -13983,24 +12505,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Mac-Clang-x86_64-Release-TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14107,24 +12611,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-arm64-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14238,24 +12724,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14370,24 +12838,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86-Debug-Exceptions": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14502,24 +12952,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14634,24 +13066,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14766,24 +13180,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Debug-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -14898,24 +13294,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Debug-UBSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15030,24 +13408,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Debug-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15163,24 +13523,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15295,24 +13637,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Release-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15427,24 +13751,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Release-UBSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15559,24 +13865,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-Clang-x86_64-Release-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15692,24 +13980,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-MSVC-x86-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15819,24 +14089,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-MSVC-x86-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -15946,24 +14198,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-MSVC-x86_64-Debug": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16073,24 +14307,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-MSVC-x86_64-Debug-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16201,24 +14417,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-MSVC-x86_64-Release": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16328,24 +14526,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Build-Win-MSVC-x86_64-Release-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16456,24 +14636,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16587,24 +14749,6 @@
       "priority": 0.8
     },
     "Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16718,16 +14862,6 @@
       "priority": 0.8
     },
     "Housekeeper-Nightly-Bookmaker": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16838,12 +14972,6 @@
       "service_account": "skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Housekeeper-Nightly-RecreateSKPs_Canary": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -16953,24 +15081,6 @@
       "service_account": "skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Housekeeper-OnDemand-Presubmit": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17074,24 +15184,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Housekeeper-PerCommit": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17200,16 +15292,6 @@
       "service_account": "skia-external-housekeeper@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Housekeeper-PerCommit-Bookmaker": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17358,16 +15440,6 @@
       "priority": 0.7
     },
     "Housekeeper-PerCommit-CheckGeneratedFiles": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17455,24 +15527,6 @@
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Housekeeper-PerCommit-InfraTests": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17718,12 +15772,6 @@
       "priority": 0.7
     },
     "Housekeeper-Weekly-RecreateSKPs": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17833,12 +15881,6 @@
       "service_account": "skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -17936,12 +15978,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18039,12 +16075,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18142,12 +16172,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18245,12 +16269,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18348,12 +16366,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18451,12 +16463,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18554,12 +16560,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18657,12 +16657,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18760,12 +16754,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18863,12 +16851,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -18966,12 +16948,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19069,12 +17045,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19172,12 +17142,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19275,12 +17239,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19378,12 +17336,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19481,12 +17433,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19584,12 +17530,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19687,12 +17627,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19790,12 +17724,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19893,12 +17821,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -19996,12 +17918,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20099,12 +18015,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20202,12 +18112,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20305,12 +18209,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20408,12 +18306,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20511,12 +18403,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20614,12 +18500,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20717,12 +18597,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20820,12 +18694,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -20923,12 +18791,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21026,12 +18888,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21129,12 +18985,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21232,12 +19082,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21335,12 +19179,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21438,12 +19276,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21541,12 +19373,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21644,12 +19470,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21747,12 +19567,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21850,12 +19664,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -21953,12 +19761,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22056,12 +19858,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22159,12 +19955,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22260,12 +20050,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22361,12 +20145,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22464,12 +20242,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22565,12 +20337,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22668,12 +20434,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22771,12 +20531,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22874,12 +20628,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -22977,12 +20725,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23078,12 +20820,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23179,12 +20915,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23280,12 +21010,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23383,12 +21107,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23486,12 +21204,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23589,12 +21301,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23692,12 +21398,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23795,12 +21495,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -23898,12 +21592,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24001,12 +21689,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24104,12 +21786,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24207,12 +21883,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24310,12 +21980,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24413,12 +22077,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24516,12 +22174,6 @@
       "priority": 0.8
     },
     "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24617,12 +22269,6 @@
       "priority": 0.8
     },
     "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24718,12 +22364,6 @@
       "priority": 0.8
     },
     "Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24819,12 +22459,6 @@
       "priority": 0.8
     },
     "Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -24920,12 +22554,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25034,12 +22662,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25148,12 +22770,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25267,12 +22883,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25386,12 +22996,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25500,12 +23104,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25614,12 +23212,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25728,12 +23320,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25847,12 +23433,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -25961,12 +23541,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26075,12 +23649,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26189,12 +23757,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26303,12 +23865,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26422,12 +23978,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26546,12 +24096,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26665,12 +24209,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26789,12 +24327,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -26908,12 +24440,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27032,12 +24558,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27151,12 +24671,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27275,12 +24789,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27394,12 +24902,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27513,12 +25015,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27632,12 +25128,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27751,12 +25241,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27865,12 +25349,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -27979,12 +25457,6 @@
       "priority": 0.8
     },
     "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28093,12 +25565,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28207,12 +25673,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28321,12 +25781,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28435,12 +25889,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28549,12 +25997,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28663,12 +26105,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28777,12 +26213,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -28891,12 +26321,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29005,12 +26429,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29119,12 +26537,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29234,12 +26646,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29349,12 +26755,6 @@
       "priority": 0.8
     },
     "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29464,24 +26864,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29590,24 +26972,6 @@
       "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29716,12 +27080,6 @@
       "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29830,12 +27188,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -29949,12 +27301,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30068,12 +27414,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30182,12 +27522,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30301,12 +27635,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30420,12 +27748,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30540,12 +27862,6 @@
       "priority": 0.8
     },
     "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30660,12 +27976,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30774,12 +28084,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -30888,12 +28192,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31002,12 +28300,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31116,12 +28408,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31230,12 +28516,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31344,12 +28624,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31458,12 +28732,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31572,12 +28840,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31686,12 +28948,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31800,12 +29056,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -31914,12 +29164,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32028,12 +29272,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32142,12 +29380,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32256,12 +29488,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32370,12 +29596,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32484,12 +29704,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32598,12 +29812,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32712,12 +29920,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32826,12 +30028,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -32940,12 +30136,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33054,12 +30244,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33168,12 +30352,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33282,12 +30460,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33396,12 +30568,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33510,12 +30676,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33624,12 +30784,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33738,12 +30892,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33852,12 +31000,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -33966,12 +31108,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34080,12 +31216,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34194,12 +31324,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34308,12 +31432,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34422,12 +31540,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34536,12 +31648,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34650,12 +31756,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34764,12 +31864,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34878,12 +31972,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -34992,12 +32080,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35106,12 +32188,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35220,12 +32296,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35334,12 +32404,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35448,12 +32512,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35563,12 +32621,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35678,12 +32730,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35793,12 +32839,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -35908,12 +32948,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36023,12 +33057,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36138,12 +33166,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36252,12 +33274,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36366,12 +33382,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36480,12 +33490,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36594,12 +33598,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36708,12 +33706,6 @@
       "priority": 0.8
     },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36822,12 +33814,6 @@
       "priority": 0.8
     },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -36936,12 +33922,6 @@
       "priority": 0.8
     },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37050,12 +34030,6 @@
       "priority": 0.8
     },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37164,12 +34138,6 @@
       "priority": 0.8
     },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37278,12 +34246,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37394,12 +34356,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37510,12 +34466,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37626,12 +34576,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37742,12 +34686,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37858,12 +34796,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -37974,12 +34906,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38090,12 +35016,6 @@
       "priority": 0.8
     },
     "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38206,12 +35126,6 @@
       "priority": 0.8
     },
     "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38320,12 +35234,6 @@
       "priority": 0.8
     },
     "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38434,12 +35342,6 @@
       "priority": 0.8
     },
     "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38548,12 +35450,6 @@
       "priority": 0.8
     },
     "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38662,12 +35558,6 @@
       "priority": 0.8
     },
     "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38776,12 +35666,6 @@
       "priority": 0.8
     },
     "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38890,12 +35774,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -38992,12 +35870,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39094,12 +35966,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39196,12 +36062,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39298,12 +36158,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39400,12 +36254,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39502,12 +36350,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39605,12 +36447,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39708,12 +36544,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39811,12 +36641,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -39914,12 +36738,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40017,12 +36835,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40120,12 +36932,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40223,12 +37029,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40326,12 +37126,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40429,12 +37223,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40532,12 +37320,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40635,12 +37417,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40738,12 +37514,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40841,12 +37611,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -40944,12 +37708,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41047,12 +37805,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41150,12 +37902,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41253,12 +37999,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41356,12 +38096,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41459,12 +38193,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41562,12 +38290,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41665,12 +38387,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41768,12 +38484,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41872,12 +38582,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -41975,12 +38679,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42078,12 +38776,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42182,12 +38874,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42285,12 +38971,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42388,12 +39068,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42491,12 +39165,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42594,12 +39262,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42697,12 +39359,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42801,12 +39457,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -42905,12 +39555,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43008,12 +39652,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43111,12 +39749,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43214,12 +39846,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43317,12 +39943,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43420,12 +40040,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43523,12 +40137,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43626,12 +40234,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43729,12 +40331,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43833,12 +40429,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -43937,12 +40527,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44040,12 +40624,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44143,12 +40721,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44246,12 +40818,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44349,12 +40915,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44452,12 +41012,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44555,12 +41109,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44658,12 +41206,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44761,12 +41303,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44864,12 +41400,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -44967,12 +41497,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45070,12 +41594,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45173,12 +41691,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45276,12 +41788,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45379,12 +41885,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45482,12 +41982,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45585,12 +42079,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45688,12 +42176,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45791,12 +42273,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45894,12 +42370,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -45997,12 +42467,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46100,12 +42564,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46203,12 +42661,6 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46306,12 +42758,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46409,12 +42855,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46512,12 +42952,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46615,12 +43049,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46718,12 +43146,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46821,12 +43243,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -46924,12 +43340,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47027,12 +43437,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47130,12 +43534,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47233,12 +43631,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47336,12 +43728,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47439,12 +43825,6 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47542,12 +43922,6 @@
       "priority": 0.8
     },
     "Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47643,12 +44017,6 @@
       "priority": 0.8
     },
     "Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47744,12 +44112,6 @@
       "priority": 0.8
     },
     "Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47845,12 +44207,6 @@
       "priority": 0.8
     },
     "Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -47946,12 +44302,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48060,12 +44410,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48174,12 +44518,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48293,12 +44631,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48412,12 +44744,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48526,12 +44852,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48640,12 +44960,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48754,12 +45068,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48868,12 +45176,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -48982,12 +45284,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_01_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49096,12 +45392,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_02_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49210,12 +45500,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_03_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49324,12 +45608,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_04_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49438,12 +45716,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_05_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49552,12 +45824,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_06_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49666,12 +45932,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_07_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49780,12 +46040,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_08_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -49894,12 +46148,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_09_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50008,12 +46256,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_10_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50122,12 +46364,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_11_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50236,12 +46472,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50350,12 +46580,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50469,12 +46693,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50583,12 +46801,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50697,12 +46909,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50811,12 +47017,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -50925,12 +47125,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51039,12 +47233,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51153,12 +47341,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51272,12 +47454,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51386,12 +47562,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51500,12 +47670,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51619,12 +47783,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51743,12 +47901,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51862,12 +48014,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -51986,12 +48132,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52105,12 +48245,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52229,12 +48363,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52348,12 +48476,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52472,12 +48594,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52591,12 +48707,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52710,12 +48820,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52829,12 +48933,6 @@
       "priority": 0.8
     },
     "Test-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -52948,12 +49046,6 @@
       "priority": 0.8
     },
     "Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53062,12 +49154,6 @@
       "priority": 0.8
     },
     "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53176,12 +49262,6 @@
       "priority": 0.8
     },
     "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53290,12 +49370,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53404,12 +49478,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53518,12 +49586,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53632,12 +49694,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53746,12 +49802,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53860,12 +49910,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -53974,12 +50018,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54088,12 +50126,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54202,12 +50234,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54316,12 +50342,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54430,12 +50450,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54544,12 +50558,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54658,12 +50666,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54773,12 +50775,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -54888,12 +50884,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55003,12 +50993,6 @@
       "priority": 0.8
     },
     "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55118,24 +51102,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55244,24 +51210,6 @@
       "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55370,24 +51318,6 @@
       "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55496,12 +51426,6 @@
       "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55610,12 +51534,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55729,12 +51647,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55843,12 +51755,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -55962,12 +51868,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56076,12 +51976,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56195,12 +52089,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56319,12 +52207,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56438,12 +52320,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56557,12 +52433,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56671,12 +52541,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Vulkan_Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56790,12 +52654,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -56904,12 +52762,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57023,12 +52875,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57142,12 +52988,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57266,12 +53106,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57385,12 +53219,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57509,12 +53337,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57623,12 +53445,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57742,12 +53558,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57861,12 +53671,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -57981,12 +53785,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58101,12 +53899,6 @@
       "priority": 0.8
     },
     "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58221,12 +54013,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58335,12 +54121,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58449,12 +54229,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58563,12 +54337,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58677,12 +54445,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58791,12 +54553,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -58905,12 +54661,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59019,12 +54769,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59133,12 +54877,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59247,12 +54985,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59361,12 +55093,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59475,12 +55201,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59589,12 +55309,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59703,12 +55417,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59822,12 +55530,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -59936,12 +55638,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60050,12 +55746,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60164,12 +55854,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60278,12 +55962,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60397,12 +56075,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60511,12 +56183,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60625,12 +56291,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60739,12 +56399,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60853,12 +56507,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -60967,12 +56615,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61081,12 +56723,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61195,12 +56831,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61309,12 +56939,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61423,12 +57047,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61537,12 +57155,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61651,12 +57263,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61765,12 +57371,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61879,12 +57479,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -61993,12 +57587,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62107,12 +57695,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62221,12 +57803,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62335,12 +57911,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62449,12 +58019,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62563,12 +58127,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62677,12 +58235,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62791,12 +58343,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -62905,12 +58451,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63019,12 +58559,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63133,12 +58667,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63247,12 +58775,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63361,12 +58883,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63475,12 +58991,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63589,12 +59099,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63704,12 +59208,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63819,12 +59317,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -63934,12 +59426,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64049,12 +59535,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64164,12 +59644,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64279,12 +59753,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64393,12 +59861,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64507,12 +59969,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64621,12 +60077,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64735,12 +60185,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64849,12 +60293,6 @@
       "priority": 0.8
     },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -64963,12 +60401,6 @@
       "priority": 0.8
     },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65077,12 +60509,6 @@
       "priority": 0.8
     },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65191,12 +60617,6 @@
       "priority": 0.8
     },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65305,12 +60725,6 @@
       "priority": 0.8
     },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65419,12 +60833,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65535,12 +60943,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65651,12 +61053,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65767,12 +61163,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65883,12 +61273,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -65999,12 +61383,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66115,12 +61493,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66231,12 +61603,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66347,12 +61713,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66463,12 +61823,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66579,12 +61933,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66695,12 +62043,6 @@
       "priority": 0.8
     },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66811,12 +62153,6 @@
       "priority": 0.8
     },
     "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -66927,12 +62263,6 @@
       "priority": 0.8
     },
     "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67043,12 +62373,6 @@
       "priority": 0.8
     },
     "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67159,12 +62483,6 @@
       "priority": 0.8
     },
     "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67275,12 +62593,6 @@
       "priority": 0.8
     },
     "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67389,12 +62701,6 @@
       "priority": 0.8
     },
     "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67503,12 +62809,6 @@
       "priority": 0.8
     },
     "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67617,12 +62917,6 @@
       "priority": 0.8
     },
     "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67731,12 +63025,6 @@
       "priority": 0.8
     },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67845,12 +63133,6 @@
       "priority": 0.8
     },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -67959,12 +63241,6 @@
       "priority": 0.8
     },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68073,12 +63349,6 @@
       "priority": 0.8
     },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68187,12 +63457,6 @@
       "priority": 0.8
     },
     "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68301,12 +63565,6 @@
       "priority": 0.8
     },
     "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68415,12 +63673,6 @@
       "priority": 0.8
     },
     "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68529,12 +63781,6 @@
       "priority": 0.8
     },
     "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68643,12 +63889,6 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68745,12 +63985,6 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68847,12 +64081,6 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -68949,12 +64177,6 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69051,12 +64273,6 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69153,12 +64369,6 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69255,12 +64465,6 @@
       "priority": 0.8
     },
     "Upload-Build-Debian9-Clang-arm-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69349,12 +64553,6 @@
       "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Build-Debian9-Clang-arm64-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69443,12 +64641,6 @@
       "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Build-Debian9-Clang-x64-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69537,12 +64729,6 @@
       "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Build-Debian9-Clang-x86-Release-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69631,12 +64817,6 @@
       "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69730,12 +64910,6 @@
       "service_account": "skia-external-calmbench-upload@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69829,12 +65003,6 @@
       "service_account": "skia-external-calmbench-upload@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -69928,12 +65096,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70027,12 +65189,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70126,12 +65282,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70225,12 +65375,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70324,12 +65468,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70423,12 +65561,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70522,12 +65654,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70621,12 +65747,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70720,12 +65840,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70819,12 +65933,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -70918,12 +66026,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71017,12 +66119,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71116,12 +66212,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71215,12 +66305,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71314,12 +66398,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71413,12 +66491,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71512,12 +66584,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71611,12 +66677,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71710,12 +66770,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71809,12 +66863,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -71908,12 +66956,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72007,12 +67049,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72106,12 +67142,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72205,12 +67235,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72304,12 +67328,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72403,12 +67421,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72502,12 +67514,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72601,12 +67607,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72700,12 +67700,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72799,12 +67793,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72898,12 +67886,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -72997,12 +67979,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73096,12 +68072,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73195,12 +68165,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73294,12 +68258,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73393,12 +68351,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73492,12 +68444,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73591,12 +68537,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73690,12 +68630,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73789,12 +68723,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73888,12 +68816,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -73987,12 +68909,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74086,12 +69002,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74185,12 +69095,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74284,12 +69188,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74383,12 +69281,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74482,12 +69374,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74581,12 +69467,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74680,12 +69560,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74779,12 +69653,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74878,12 +69746,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -74977,12 +69839,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75076,12 +69932,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75175,12 +70025,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75274,12 +70118,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75373,12 +70211,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75472,12 +70304,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75571,12 +70397,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75670,12 +70490,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75769,12 +70583,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75868,12 +70676,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -75967,12 +70769,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76066,12 +70862,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76165,12 +70955,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76264,12 +71048,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76363,12 +71141,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76462,12 +71234,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76561,12 +71327,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76660,12 +71420,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76759,12 +71513,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76858,12 +71606,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -76957,12 +71699,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77056,12 +71792,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77155,12 +71885,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77254,12 +71978,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77353,12 +72071,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77452,12 +72164,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77551,12 +72257,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77650,12 +72350,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77749,12 +72443,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77848,12 +72536,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -77947,12 +72629,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78046,12 +72722,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78145,12 +72815,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78244,12 +72908,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78343,12 +73001,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78442,12 +73094,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78541,12 +73187,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78640,12 +73280,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78739,12 +73373,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78838,12 +73466,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -78937,12 +73559,6 @@
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79036,12 +73652,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79135,12 +73745,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79234,12 +73838,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79333,12 +73931,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79432,12 +74024,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79531,12 +74117,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79630,12 +74210,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79729,12 +74303,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79828,12 +74396,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -79927,12 +74489,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80026,12 +74582,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80125,12 +74675,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80224,12 +74768,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80323,12 +74861,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80422,12 +74954,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80521,12 +75047,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80620,12 +75140,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80719,12 +75233,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80818,12 +75326,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -80917,12 +75419,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81016,12 +75512,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81115,12 +75605,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81214,12 +75698,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81313,12 +75791,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81412,12 +75884,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81511,12 +75977,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81610,12 +76070,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81709,12 +76163,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81808,12 +76256,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -81907,12 +76349,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82006,12 +76442,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82105,12 +76535,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82204,12 +76628,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82303,12 +76721,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82402,12 +76814,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82501,12 +76907,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82600,12 +77000,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82699,12 +77093,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82798,12 +77186,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82897,12 +77279,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -82996,12 +77372,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83095,12 +77465,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83194,12 +77558,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83293,12 +77651,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83392,12 +77744,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83491,12 +77837,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83590,12 +77930,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83689,12 +78023,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83788,12 +78116,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83887,12 +78209,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -83986,12 +78302,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84085,12 +78395,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84184,12 +78488,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84283,12 +78581,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84382,12 +78674,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84481,12 +78767,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84580,12 +78860,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84679,12 +78953,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84778,12 +79046,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84877,12 +79139,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -84976,12 +79232,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85075,12 +79325,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85174,12 +79418,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85273,12 +79511,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85372,12 +79604,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85471,12 +79697,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85570,12 +79790,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85669,12 +79883,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85768,12 +79976,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85867,12 +80069,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -85966,12 +80162,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86065,12 +80255,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86164,12 +80348,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86263,12 +80441,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86362,12 +80534,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86461,12 +80627,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86560,12 +80720,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86659,12 +80813,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86758,12 +80906,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86857,12 +80999,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -86956,12 +81092,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87055,24 +81185,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87213,12 +81325,6 @@
       "service_account": "skia-external-coverage-uploade@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87312,12 +81418,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87411,12 +81511,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87510,12 +81604,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87609,12 +81697,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87708,12 +81790,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87807,12 +81883,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -87906,12 +81976,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88005,12 +82069,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88104,12 +82162,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88203,12 +82255,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88302,12 +82348,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88401,12 +82441,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88500,12 +82534,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88599,12 +82627,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88698,12 +82720,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88797,12 +82813,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88896,12 +82906,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -88995,12 +82999,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89094,12 +83092,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89193,12 +83185,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89292,12 +83278,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89391,12 +83371,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89490,12 +83464,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89589,12 +83557,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89688,12 +83650,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89787,12 +83743,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89886,12 +83836,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -89985,12 +83929,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90084,12 +84022,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90183,12 +84115,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90282,12 +84208,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90381,12 +84301,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90480,12 +84394,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90579,12 +84487,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90678,12 +84580,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90777,12 +84673,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90876,12 +84766,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -90975,24 +84859,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91122,12 +84988,6 @@
       "service_account": "skia-external-coverage-uploade@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91221,12 +85081,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91320,12 +85174,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91419,12 +85267,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91518,12 +85360,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91617,24 +85453,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91769,12 +85587,6 @@
       "service_account": "skia-external-coverage-uploade@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91868,12 +85680,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -91967,12 +85773,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92066,12 +85866,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92165,12 +85959,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92264,12 +86052,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92363,12 +86145,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92462,12 +86238,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92561,12 +86331,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92660,12 +86424,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92759,12 +86517,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92858,12 +86610,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -92957,12 +86703,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93056,12 +86796,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93155,12 +86889,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93254,12 +86982,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93353,12 +87075,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93452,12 +87168,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93551,12 +87261,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93650,12 +87354,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93749,12 +87447,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93848,12 +87540,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -93947,12 +87633,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94046,12 +87726,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94145,12 +87819,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94244,12 +87912,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94343,12 +88005,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94442,12 +88098,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94541,12 +88191,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94640,12 +88284,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94739,12 +88377,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94838,12 +88470,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -94937,12 +88563,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95036,12 +88656,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95135,12 +88749,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95234,12 +88842,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95333,12 +88935,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95432,12 +89028,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95531,12 +89121,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95630,12 +89214,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95729,12 +89307,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95828,12 +89400,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -95927,12 +89493,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96026,12 +89586,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96125,12 +89679,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96224,12 +89772,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96323,12 +89865,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96422,12 +89958,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96521,12 +90051,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96620,12 +90144,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96719,12 +90237,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96818,12 +90330,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -96917,12 +90423,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97016,12 +90516,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97115,12 +90609,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97214,12 +90702,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97313,12 +90795,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97412,12 +90888,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97511,12 +90981,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97610,12 +91074,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97709,12 +91167,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97808,12 +91260,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -97907,12 +91353,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98006,12 +91446,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98105,12 +91539,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98204,12 +91632,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98303,12 +91725,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98402,12 +91818,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98501,12 +91911,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98600,12 +92004,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98699,12 +92097,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98798,12 +92190,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98897,12 +92283,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -98996,12 +92376,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99095,12 +92469,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99194,12 +92562,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99293,12 +92655,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99392,12 +92748,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99491,12 +92841,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99590,12 +92934,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99689,12 +93027,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99788,12 +93120,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99887,12 +93213,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -99986,12 +93306,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100085,12 +93399,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100184,12 +93492,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100283,12 +93585,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100382,12 +93678,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100481,12 +93771,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100580,12 +93864,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100679,12 +93957,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100778,12 +94050,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100877,12 +94143,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -100976,12 +94236,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -101075,12 +94329,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",
@@ -101174,12 +94422,6 @@
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
       "cipd_packages": [
         {
           "name": "infra/tools/luci/kitchen/${platform}",