Roll deps

The roller was confused by something, but I'm not sure what.

Change-Id: I43ecfecb4366e907159cb756e198525925d6d21c
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/70820
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 0206c76..76f0812 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -21,12 +21,12 @@
   "deps": {
     "fuchsia": {
       "branch": "refs/heads/main",
-      "revision": "b4d8928050d0be89b9eb0d2a33c3249dff2adbf4",
+      "revision": "8a6a65503b8a493467fab243cc88fdc1e8f2e016",
       "url": "https://fuchsia.googlesource.com/infra/recipes"
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "cb62e2ac49c58c31f7245b2e602cd21496ecc448",
+      "revision": "a8f2ad5eff316712dffc29d3a114c3c068afb5e5",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py"
     }
   },
diff --git a/recipe_modules/build/tests/full.expected/full.json b/recipe_modules/build/tests/full.expected/full.json
index 60e3a38..7d47290 100644
--- a/recipe_modules/build/tests/full.expected/full.json
+++ b/recipe_modules/build/tests/full.expected/full.json
@@ -147,7 +147,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
     ],
     "infra_step": true,
     "name": "archive to cas.install infra/tools/luci/cas.ensure package directory",
@@ -160,7 +160,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -205,7 +205,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index f6e0fc7..92446a0 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/git.expected/no_props.json b/recipe_modules/checkout/tests/git.expected/no_props.json
index a8c8119..95de2fd 100644
--- a/recipe_modules/checkout/tests/git.expected/no_props.json
+++ b/recipe_modules/checkout/tests/git.expected/no_props.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index 36eaaa2..e41e7a5 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -231,8 +231,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index 9f0465b..7c988e9 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 2dc38cf..15a3714 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/repo.expected/ci.json b/recipe_modules/checkout/tests/repo.expected/ci.json
index 4583e03..5e1efad 100644
--- a/recipe_modules/checkout/tests/repo.expected/ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/ci.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
index d7fa3d4..212a7b1 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
index 9875d5d..3fc3a35 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
index fb81d50..03b5973 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
@@ -86,7 +86,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -111,7 +111,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -150,7 +150,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -195,7 +195,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -240,7 +240,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -300,7 +300,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://default-review.googlesource.com",
@@ -342,7 +342,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
index 7bcd5cd..3aece31 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -239,7 +239,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -299,7 +299,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://default-review.googlesource.com",
@@ -341,7 +341,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/no_trigger.json b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
index 4e8b4d5..8b22ce0 100644
--- a/recipe_modules/checkout/tests/repo.expected/no_trigger.json
+++ b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/prefix.json b/recipe_modules/checkout/tests/repo.expected/prefix.json
index cd6aa36..c7330b0 100644
--- a/recipe_modules/checkout/tests/repo.expected/prefix.json
+++ b/recipe_modules/checkout/tests/repo.expected/prefix.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
index be0b91e..e382194 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
@@ -86,7 +86,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -111,7 +111,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -150,7 +150,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -195,7 +195,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -256,7 +256,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -298,7 +298,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -374,7 +374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -435,7 +435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://default-review.googlesource.com",
@@ -477,7 +477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -560,7 +560,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
index 747a56d..78d1209 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
@@ -88,7 +88,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -113,7 +113,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -152,7 +152,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -197,7 +197,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -242,7 +242,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -287,7 +287,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -347,7 +347,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -389,7 +389,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple.json b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
index 849d9e3..8d95269 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
@@ -86,7 +86,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -111,7 +111,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -150,7 +150,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -195,7 +195,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -240,7 +240,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
@@ -300,7 +300,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://default-review.googlesource.com",
@@ -342,7 +342,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://default-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try.json b/recipe_modules/checkout/tests/repo.expected/try.json
index 714b4bb..e7ffdd395 100644
--- a/recipe_modules/checkout/tests/repo.expected/try.json
+++ b/recipe_modules/checkout/tests/repo.expected/try.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
index c196638..8d6d39f 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
index d94a5d6..b451223 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index 37c9744..1c5eca0 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index 30d3a72..c667a92 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://z-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://z-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://z-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://z-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json
index d7e0899..cce1f07 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index 52df9f8..4a0998c 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -87,7 +87,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -112,7 +112,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -151,7 +151,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -196,7 +196,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -257,7 +257,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -299,7 +299,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -376,7 +376,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -437,7 +437,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -479,7 +479,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -539,7 +539,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -600,7 +600,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -642,7 +642,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -741,7 +741,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -779,7 +779,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -987,8 +987,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index 2037c1e..6d7d0f1 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -89,7 +89,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -114,7 +114,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -153,7 +153,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -198,7 +198,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -259,7 +259,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -301,7 +301,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -379,7 +379,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -440,7 +440,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -482,7 +482,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -542,7 +542,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -603,7 +603,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -645,7 +645,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -705,7 +705,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://forbidden-review.googlesource.com",
@@ -749,7 +749,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://forbidden-review.googlesource.com",
@@ -832,7 +832,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -870,7 +870,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1086,8 +1086,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index d683a3b..a0e260f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -88,7 +88,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -113,7 +113,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -152,7 +152,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -197,7 +197,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -242,7 +242,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -287,7 +287,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -347,7 +347,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -389,7 +389,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -642,8 +642,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index 871de7c..ed8055f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -87,7 +87,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -112,7 +112,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -151,7 +151,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -196,7 +196,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -241,7 +241,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -286,7 +286,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -346,7 +346,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -388,7 +388,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -641,8 +641,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index ea54c36..21c63ee 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 38738b7..9ddebd0 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://x-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://x-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipe_modules/cq_deps/tests/full.expected/abandoned.json b/recipe_modules/cq_deps/tests/full.expected/abandoned.json
index fbecc70..01c7669 100644
--- a/recipe_modules/cq_deps/tests/full.expected/abandoned.json
+++ b/recipe_modules/cq_deps/tests/full.expected/abandoned.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json b/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json
index 028b0c1..9fbe819 100644
--- a/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json
+++ b/recipe_modules/cq_deps/tests/full.expected/bad_field_name.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json b/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json
index bd2fbc5..cbabe1d 100644
--- a/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json
+++ b/recipe_modules/cq_deps/tests/full.expected/cl-not-found.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/commas.json b/recipe_modules/cq_deps/tests/full.expected/commas.json
index 49c3386..b62632c 100644
--- a/recipe_modules/cq_deps/tests/full.expected/commas.json
+++ b/recipe_modules/cq_deps/tests/full.expected/commas.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -280,7 +280,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -310,7 +310,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json b/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json
index 0d55b62..8c7e94d 100644
--- a/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json
+++ b/recipe_modules/cq_deps/tests/full.expected/dependency-requires-parent.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -281,7 +281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -311,7 +311,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/error.json b/recipe_modules/cq_deps/tests/full.expected/error.json
index 048df36..01ec869 100644
--- a/recipe_modules/cq_deps/tests/full.expected/error.json
+++ b/recipe_modules/cq_deps/tests/full.expected/error.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -266,7 +266,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/error_recovery.json b/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
index b22ab5d..7862b26 100644
--- a/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
+++ b/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -266,7 +266,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -315,7 +315,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -345,7 +345,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/forbidden.json b/recipe_modules/cq_deps/tests/full.expected/forbidden.json
index a41b682..b77b76b 100644
--- a/recipe_modules/cq_deps/tests/full.expected/forbidden.json
+++ b/recipe_modules/cq_deps/tests/full.expected/forbidden.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://forbidden-review.googlesource.com",
@@ -264,7 +264,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://forbidden-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json b/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json
index add6216..420254a 100644
--- a/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json
+++ b/recipe_modules/cq_deps/tests/full.expected/gibberish-requirement.json
@@ -52,7 +52,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -65,7 +65,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -92,7 +92,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -141,7 +141,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -171,7 +171,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/hash.json b/recipe_modules/cq_deps/tests/full.expected/hash.json
index 5114088..9e7b48b 100644
--- a/recipe_modules/cq_deps/tests/full.expected/hash.json
+++ b/recipe_modules/cq_deps/tests/full.expected/hash.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -119,7 +119,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -198,7 +198,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json b/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json
index 5e03db2..59fcb5d 100644
--- a/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json
+++ b/recipe_modules/cq_deps/tests/full.expected/ignore_errors.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/loop_three.json b/recipe_modules/cq_deps/tests/full.expected/loop_three.json
index 8c1d5b0..bd5fe50 100644
--- a/recipe_modules/cq_deps/tests/full.expected/loop_three.json
+++ b/recipe_modules/cq_deps/tests/full.expected/loop_three.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -281,7 +281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -311,7 +311,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -375,7 +375,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -424,7 +424,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -454,7 +454,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/loop_two.json b/recipe_modules/cq_deps/tests/full.expected/loop_two.json
index 03faa3f..a579363 100644
--- a/recipe_modules/cq_deps/tests/full.expected/loop_two.json
+++ b/recipe_modules/cq_deps/tests/full.expected/loop_two.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -281,7 +281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -311,7 +311,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/merged_ok.json b/recipe_modules/cq_deps/tests/full.expected/merged_ok.json
index 57a418a..3df38ea 100644
--- a/recipe_modules/cq_deps/tests/full.expected/merged_ok.json
+++ b/recipe_modules/cq_deps/tests/full.expected/merged_ok.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -297,7 +297,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -345,7 +345,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -375,7 +375,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json b/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
index a21bae8..76c5957 100644
--- a/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
+++ b/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/multiline.json b/recipe_modules/cq_deps/tests/full.expected/multiline.json
index 69620d5..289f836 100644
--- a/recipe_modules/cq_deps/tests/full.expected/multiline.json
+++ b/recipe_modules/cq_deps/tests/full.expected/multiline.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -233,7 +233,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -281,7 +281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -311,7 +311,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -359,7 +359,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -407,7 +407,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json b/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json
index fde46c6..969ed44 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no-parent-cl.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json b/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json
index 9f53177..e028f36 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no_gerrit_name.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -280,7 +280,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -310,7 +310,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/no_space.json b/recipe_modules/cq_deps/tests/full.expected/no_space.json
index 55b4076..86d6ba9 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no_space.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no_space.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -233,7 +233,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -281,7 +281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -311,7 +311,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -359,7 +359,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -407,7 +407,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/one.json b/recipe_modules/cq_deps/tests/full.expected/one.json
index 2094171..da3ab10 100644
--- a/recipe_modules/cq_deps/tests/full.expected/one.json
+++ b/recipe_modules/cq_deps/tests/full.expected/one.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -232,7 +232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -280,7 +280,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -310,7 +310,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json b/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json
index 4dc8d9a..ac2b406 100644
--- a/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json
+++ b/recipe_modules/cq_deps/tests/full.expected/out-of-date-parent.json
@@ -52,7 +52,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -65,7 +65,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -92,7 +92,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -141,7 +141,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -171,7 +171,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -220,7 +220,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -250,7 +250,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/two.json b/recipe_modules/cq_deps/tests/full.expected/two.json
index ee8b6a5..c542d3b 100644
--- a/recipe_modules/cq_deps/tests/full.expected/two.json
+++ b/recipe_modules/cq_deps/tests/full.expected/two.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -233,7 +233,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -281,7 +281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -311,7 +311,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -359,7 +359,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -407,7 +407,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json b/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json
index deadd6d..1f0cd26 100644
--- a/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json
+++ b/recipe_modules/cq_deps/tests/full.expected/unsubmitted-parent-dependencies.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "resolve CL deps.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -138,7 +138,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -168,7 +168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -217,7 +217,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -247,7 +247,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -327,7 +327,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -375,7 +375,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -405,7 +405,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index 066f5b7..70f6759 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -40,7 +40,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280"
+      "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280"
     ],
     "infra_step": true,
     "name": "environment.setup platform.ensure XCode 12b5025f.install infra/tools/mac_toolchain.ensure package directory",
@@ -53,7 +53,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280",
+      "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280",
       "-max-threads",
@@ -80,7 +80,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280/mac_toolchain",
+      "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280/mac_toolchain",
       "install",
       "-kind",
       "mac",
diff --git a/recipe_modules/repo/examples/full.expected/setup_repo.json b/recipe_modules/repo/examples/full.expected/setup_repo.json
index 480f3eb..9baf409 100644
--- a/recipe_modules/repo/examples/full.expected/setup_repo.json
+++ b/recipe_modules/repo/examples/full.expected/setup_repo.json
@@ -156,11 +156,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "write manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@manifest_tmp_1@<manifest></manifest>@@@",
-      "@@@STEP_LOG_END@manifest_tmp_1@@@"
-    ]
+    "name": "write manifest"
   },
   {
     "cmd": [
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
index 432d456..1c76a42 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
@@ -92,7 +92,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/abc",
     "infra_step": true,
@@ -106,7 +106,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -134,7 +134,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -164,7 +164,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -252,7 +252,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -282,7 +282,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -324,7 +324,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -354,7 +354,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -396,7 +396,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -426,7 +426,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -514,7 +514,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -544,7 +544,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -586,7 +586,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -616,7 +616,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
index 8b68b5f..a6ee8b5 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
@@ -92,7 +92,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/abc",
     "infra_step": true,
@@ -106,7 +106,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -134,7 +134,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -164,7 +164,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -206,7 +206,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,7 +236,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -278,7 +278,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -308,7 +308,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -396,7 +396,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -426,7 +426,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -468,7 +468,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -498,7 +498,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -540,7 +540,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -570,7 +570,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -658,7 +658,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -688,7 +688,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -760,7 +760,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -802,7 +802,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -832,7 +832,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
index 0bf7275..8fdecb4 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
@@ -92,7 +92,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/abc",
     "infra_step": true,
@@ -106,7 +106,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -134,7 +134,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -164,7 +164,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -252,7 +252,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -282,7 +282,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -370,7 +370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -400,7 +400,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/backwards.json b/recipe_modules/roll_util/tests/single_roll.expected/backwards.json
index 2d752e9..0dede55 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/backwards.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/backwards.json
@@ -86,7 +86,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -99,7 +99,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -126,7 +126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -154,7 +154,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -190,7 +190,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -255,7 +255,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
index a1fe87a..470eee5 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
@@ -129,7 +129,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -143,7 +143,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -171,7 +171,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -201,7 +201,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -243,7 +243,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -273,7 +273,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -315,7 +315,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -345,7 +345,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -387,7 +387,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -417,7 +417,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -459,7 +459,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -489,7 +489,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -623,7 +623,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -659,7 +659,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -724,7 +724,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
index df5e345..9c05fec 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
@@ -127,7 +127,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -141,7 +141,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -169,7 +169,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -199,7 +199,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -241,7 +241,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -271,7 +271,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -313,7 +313,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -343,7 +343,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -385,7 +385,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -415,7 +415,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -519,7 +519,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -547,7 +547,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -583,7 +583,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -648,7 +648,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
index 85ba24a..67efd37 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
@@ -129,7 +129,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -143,7 +143,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -171,7 +171,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -201,7 +201,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -243,7 +243,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -273,7 +273,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -315,7 +315,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -345,7 +345,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -387,7 +387,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -417,7 +417,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -459,7 +459,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -489,7 +489,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -594,7 +594,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -622,7 +622,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -658,7 +658,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -723,7 +723,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
index 25c3d81..b601d6b 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
@@ -127,7 +127,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -141,7 +141,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -169,7 +169,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -199,7 +199,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -300,7 +300,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -328,7 +328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -364,7 +364,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -429,7 +429,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
index 43097d8..8585663 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
@@ -127,7 +127,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -141,7 +141,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -169,7 +169,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -199,7 +199,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -299,7 +299,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -327,7 +327,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -363,7 +363,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -428,7 +428,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json
index 7791757..9770619 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date.json
@@ -57,7 +57,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -70,7 +70,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -97,7 +97,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -125,7 +125,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -161,7 +161,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -226,7 +226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json
index 38df83c..425b6eb 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/up_to_date_testonly.json
@@ -91,7 +91,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -104,7 +104,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -131,7 +131,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -159,7 +159,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -195,7 +195,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -260,7 +260,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipe_modules/util/tests/full.expected/found.json b/recipe_modules/util/tests/full.expected/found.json
index 350c2ff..242c286 100644
--- a/recipe_modules/util/tests/full.expected/found.json
+++ b/recipe_modules/util/tests/full.expected/found.json
@@ -61,7 +61,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -86,7 +86,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -125,7 +125,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://chromium-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://chromium-review.googlesource.com",
diff --git a/recipe_modules/util/tests/full.expected/not_found.json b/recipe_modules/util/tests/full.expected/not_found.json
index 9e8cbe1..bfa0afd 100644
--- a/recipe_modules/util/tests/full.expected/not_found.json
+++ b/recipe_modules/util/tests/full.expected/not_found.json
@@ -64,7 +64,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -89,7 +89,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -128,7 +128,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://chromium-review.googlesource.com",
@@ -186,7 +186,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://chromium-review.googlesource.com",
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 82df666..a7388e0 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1257,7 +1256,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
     ],
     "env": {
       "BUILDBUCKET_ID": "8945511751514863184",
@@ -1295,7 +1294,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1347,7 +1346,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/cipd_roller.expected/bad_package_spec.json b/recipes/cipd_roller.expected/bad_package_spec.json
index f3bac37..918707a 100644
--- a/recipes/cipd_roller.expected/bad_package_spec.json
+++ b/recipes/cipd_roller.expected/bad_package_spec.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/cipd_roller.expected/missing_tag.json b/recipes/cipd_roller.expected/missing_tag.json
index b7609e5..56c14ec 100644
--- a/recipes/cipd_roller.expected/missing_tag.json
+++ b/recipes/cipd_roller.expected/missing_tag.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/cipd_roller.expected/multiple_common_tags.json b/recipes/cipd_roller.expected/multiple_common_tags.json
index 78218aa..45af4a3 100644
--- a/recipes/cipd_roller.expected/multiple_common_tags.json
+++ b/recipes/cipd_roller.expected/multiple_common_tags.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/cipd_roller.expected/no_common_tags.json b/recipes/cipd_roller.expected/no_common_tags.json
index 24ba8a6..c0ac903 100644
--- a/recipes/cipd_roller.expected/no_common_tags.json
+++ b/recipes/cipd_roller.expected/no_common_tags.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
index 59e3fed..cca2e96 100644
--- a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
+++ b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
index 290537d..1891c45 100644
--- a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
+++ b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1331,7 +1330,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/cipd_setup",
     "infra_step": true,
@@ -1357,7 +1356,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1397,7 +1396,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1499,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1557,7 +1556,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/no_curlies_in_spec.json b/recipes/cipd_roller.expected/no_curlies_in_spec.json
index 86063c2..9d9b624 100644
--- a/recipes/cipd_roller.expected/no_curlies_in_spec.json
+++ b/recipes/cipd_roller.expected/no_curlies_in_spec.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1294,7 +1293,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/cipd_setup",
     "infra_step": true,
@@ -1320,7 +1319,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1360,7 +1359,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1462,7 +1461,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1520,7 +1519,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/platform-independent.json b/recipes/cipd_roller.expected/platform-independent.json
index 075420e..33057c1 100644
--- a/recipes/cipd_roller.expected/platform-independent.json
+++ b/recipes/cipd_roller.expected/platform-independent.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1169,7 +1168,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/cipd_setup",
     "infra_step": true,
@@ -1195,7 +1194,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1235,7 +1234,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1337,7 +1336,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1395,7 +1394,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cipd_roller.expected/success.json b/recipes/cipd_roller.expected/success.json
index b592f90..02a3020 100644
--- a/recipes/cipd_roller.expected/success.json
+++ b/recipes/cipd_roller.expected/success.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1294,7 +1293,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/cipd_setup",
     "infra_step": true,
@@ -1320,7 +1319,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1360,7 +1359,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1462,7 +1461,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1520,7 +1519,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/clear-dryrun.json b/recipes/cq_label.expected/clear-dryrun.json
index bee5cfe..ae26c36 100644
--- a/recipes/cq_label.expected/clear-dryrun.json
+++ b/recipes/cq_label.expected/clear-dryrun.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -107,7 +107,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/clear.json b/recipes/cq_label.expected/clear.json
index 53b3a4f..7d99ba9 100644
--- a/recipes/cq_label.expected/clear.json
+++ b/recipes/cq_label.expected/clear.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -107,7 +107,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -144,7 +144,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/dry-run.json b/recipes/cq_label.expected/dry-run.json
index 6246252..e55c1ce 100644
--- a/recipes/cq_label.expected/dry-run.json
+++ b/recipes/cq_label.expected/dry-run.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -119,7 +119,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -178,7 +178,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/failed.json b/recipes/cq_label.expected/failed.json
index 2a9c384..3e917ed 100644
--- a/recipes/cq_label.expected/failed.json
+++ b/recipes/cq_label.expected/failed.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -119,7 +119,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -171,7 +171,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -203,7 +203,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/passed.json b/recipes/cq_label.expected/passed.json
index 806147e..84ff870 100644
--- a/recipes/cq_label.expected/passed.json
+++ b/recipes/cq_label.expected/passed.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -119,7 +119,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -171,7 +171,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -203,7 +203,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/wrong-author.json b/recipes/cq_label.expected/wrong-author.json
index 33b032c..5a2bd59 100644
--- a/recipes/cq_label.expected/wrong-author.json
+++ b/recipes/cq_label.expected/wrong-author.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -119,7 +119,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -164,7 +164,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/wrong-patchset.json b/recipes/cq_label.expected/wrong-patchset.json
index 152eb23..e04d352 100644
--- a/recipes/cq_label.expected/wrong-patchset.json
+++ b/recipes/cq_label.expected/wrong-patchset.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -119,7 +119,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -164,7 +164,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/cq_label.expected/wrong-project.json b/recipes/cq_label.expected/wrong-project.json
index 249578e..edea035 100644
--- a/recipes/cq_label.expected/wrong-project.json
+++ b/recipes/cq_label.expected/wrong-project.json
@@ -42,7 +42,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -55,7 +55,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -82,7 +82,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -163,7 +163,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/docs_builder.expected/docs.json b/recipes/docs_builder.expected/docs.json
index 57bec90..7f12408 100644
--- a/recipes/docs_builder.expected/docs.json
+++ b/recipes/docs_builder.expected/docs.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -792,7 +791,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
@@ -805,7 +804,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -836,7 +835,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:21.500000Z",
       "-o",
@@ -855,7 +854,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -902,7 +901,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
@@ -923,7 +922,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
diff --git a/recipes/docs_builder.expected/docs_dry_run.json b/recipes/docs_builder.expected/docs_dry_run.json
index e72a733..f4ba748 100644
--- a/recipes/docs_builder.expected/docs_dry_run.json
+++ b/recipes/docs_builder.expected/docs_dry_run.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -792,7 +791,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
@@ -805,7 +804,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -836,7 +835,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:21.500000Z",
       "-o",
@@ -855,7 +854,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index f39a7b7..0fb1642 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 821401f..525a2ba 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index f1f7750..8455ec6 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index 2129a5b..e980f0b 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]\\cipd\\path\\to\\gerrit\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\path\\to\\gerrit\\version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[CACHE]\\cipd\\path\\to\\gerrit\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\path\\to\\gerrit\\version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]\\cipd\\path\\to\\gerrit\\version%3Apinned-version\\gerrit",
+      "[START_DIR]\\cipd_tool\\path\\to\\gerrit\\version%3Apinned-version\\gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/gerrit_auto_submit.expected/default.json b/recipes/gerrit_auto_submit.expected/default.json
index 5f08cb3..1cb4df8 100644
--- a/recipes/gerrit_auto_submit.expected/default.json
+++ b/recipes/gerrit_auto_submit.expected/default.json
@@ -70,7 +70,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "get eligible.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -83,7 +83,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -110,7 +110,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://fuchsia-review.googlesource.com",
@@ -163,7 +163,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "changes-submitted-together",
       "-host",
       "https://fuchsia-review.googlesource.com",
@@ -195,7 +195,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "get-mergeable",
       "-host",
       "https://fuchsia-review.googlesource.com",
@@ -226,7 +226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://fuchsia-review.googlesource.com",
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index 8c6cbc7..8a1b47b 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/multiple_submodule_roller.expected/missing.json b/recipes/multiple_submodule_roller.expected/missing.json
index 8e719fd..8c6068f 100644
--- a/recipes/multiple_submodule_roller.expected/missing.json
+++ b/recipes/multiple_submodule_roller.expected/missing.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/multiple_submodule_roller.expected/noop.json b/recipes/multiple_submodule_roller.expected/noop.json
index 46bb621..f5993a4 100644
--- a/recipes/multiple_submodule_roller.expected/noop.json
+++ b/recipes/multiple_submodule_roller.expected/noop.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/multiple_submodule_roller.expected/partial_noop.json b/recipes/multiple_submodule_roller.expected/partial_noop.json
index 386f838..01b95b8 100644
--- a/recipes/multiple_submodule_roller.expected/partial_noop.json
+++ b/recipes/multiple_submodule_roller.expected/partial_noop.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -637,7 +636,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -651,7 +650,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -679,7 +678,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -709,7 +708,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -869,7 +868,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -901,7 +900,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1050,7 +1049,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1116,7 +1115,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1162,7 +1161,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/multiple_submodule_roller.expected/success.json b/recipes/multiple_submodule_roller.expected/success.json
index 7a28c79..3b7359e 100644
--- a/recipes/multiple_submodule_roller.expected/success.json
+++ b/recipes/multiple_submodule_roller.expected/success.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -637,7 +636,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -651,7 +650,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -679,7 +678,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -709,7 +708,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -887,7 +886,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -917,7 +916,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -966,7 +965,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1002,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1170,7 +1169,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1236,7 +1235,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1282,7 +1281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/pigweed.expected/failure.json b/recipes/pigweed.expected/failure.json
index 7aee122..34f6165 100644
--- a/recipes/pigweed.expected/failure.json
+++ b/recipes/pigweed.expected/failure.json
@@ -184,7 +184,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
     ],
     "infra_step": true,
     "name": "build.install infra/tools/luci/swarming.ensure package directory",
@@ -197,7 +197,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -224,7 +224,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipes/pigweed.expected/infra_failure.json b/recipes/pigweed.expected/infra_failure.json
index b515614..88cfbea 100644
--- a/recipes/pigweed.expected/infra_failure.json
+++ b/recipes/pigweed.expected/infra_failure.json
@@ -184,7 +184,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
     ],
     "infra_step": true,
     "name": "build.install infra/tools/luci/swarming.ensure package directory",
@@ -197,7 +197,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -224,7 +224,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipes/pw_presubmit.expected/sign-nobuildid.json b/recipes/pw_presubmit.expected/sign-nobuildid.json
index 9076be8..35f1634 100644
--- a/recipes/pw_presubmit.expected/sign-nobuildid.json
+++ b/recipes/pw_presubmit.expected/sign-nobuildid.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1833,7 +1832,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1858,7 +1857,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -1901,7 +1900,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
@@ -1936,7 +1935,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:26.000000Z",
       "-o",
@@ -1971,7 +1970,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:27.500000Z",
       "-h",
@@ -2008,7 +2007,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:29.000000Z",
       "-o",
@@ -2043,7 +2042,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
@@ -2080,7 +2079,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:30.500000Z",
       "-o",
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index 1bc1f1b..6881afc 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1833,7 +1832,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1858,7 +1857,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -1901,7 +1900,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
@@ -1936,7 +1935,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:26.000000Z",
       "-o",
@@ -1971,7 +1970,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:27.500000Z",
       "-h",
@@ -2008,7 +2007,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:29.000000Z",
       "-o",
@@ -2043,7 +2042,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
@@ -2080,7 +2079,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:30.500000Z",
       "-o",
diff --git a/recipes/pw_presubmit.expected/step.json b/recipes/pw_presubmit.expected/step.json
index bbd65b5..3cf954b 100644
--- a/recipes/pw_presubmit.expected/step.json
+++ b/recipes/pw_presubmit.expected/step.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -2338,7 +2337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -2363,7 +2362,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -2406,7 +2405,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2020-09-13T12:28:00.000000Z",
       "-o",
@@ -2441,7 +2440,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2020-09-13T12:28:20.000000Z",
       "-o",
@@ -2476,7 +2475,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2020-09-13T12:27:40.000000Z",
       "-o",
@@ -2513,7 +2512,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2020-09-13T12:28:40.000000Z",
       "-o",
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index d18d59f..1865aef 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/repo_roller.expected/backwards.json b/recipes/repo_roller.expected/backwards.json
index 13fb1ac..8892d4a 100644
--- a/recipes/repo_roller.expected/backwards.json
+++ b/recipes/repo_roller.expected/backwards.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout a.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/repo_roller.expected/dotdot-prefix.json b/recipes/repo_roller.expected/dotdot-prefix.json
index 0879787..df391b9 100644
--- a/recipes/repo_roller.expected/dotdot-prefix.json
+++ b/recipes/repo_roller.expected/dotdot-prefix.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout g.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1713,7 +1711,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1739,7 +1737,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1779,7 +1777,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1821,7 +1819,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2047,7 +2045,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2149,7 +2147,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -2207,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/equivalent.json b/recipes/repo_roller.expected/equivalent.json
index 3ebafa4..29755cd 100644
--- a/recipes/repo_roller.expected/equivalent.json
+++ b/recipes/repo_roller.expected/equivalent.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout b.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1770,7 +1768,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1796,7 +1794,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1836,7 +1834,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1878,7 +1876,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1939,7 +1937,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -1983,7 +1981,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2203,7 +2201,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2305,7 +2303,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -2363,7 +2361,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/host-dot-dot.json b/recipes/repo_roller.expected/host-dot-dot.json
index 0d70112..a4cb83d 100644
--- a/recipes/repo_roller.expected/host-dot-dot.json
+++ b/recipes/repo_roller.expected/host-dot-dot.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout f.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1713,7 +1711,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1739,7 +1737,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1779,7 +1777,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1821,7 +1819,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2047,7 +2045,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2149,7 +2147,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -2207,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/host-prefix.json b/recipes/repo_roller.expected/host-prefix.json
index 06b6255..a26fa34 100644
--- a/recipes/repo_roller.expected/host-prefix.json
+++ b/recipes/repo_roller.expected/host-prefix.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout h.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1713,7 +1711,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1739,7 +1737,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1779,7 +1777,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1821,7 +1819,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2047,7 +2045,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2149,7 +2147,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -2207,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/name-not-found.json b/recipes/repo_roller.expected/name-not-found.json
index 47b3615..f1f9462 100644
--- a/recipes/repo_roller.expected/name-not-found.json
+++ b/recipes/repo_roller.expected/name-not-found.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
index 605dbd6..32885ec 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -560,8 +559,7 @@
     "infra_step": true,
     "name": "checkout c.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1039,7 +1037,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1053,7 +1051,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1081,7 +1079,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1111,7 +1109,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1265,7 +1263,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -1331,7 +1329,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -1377,7 +1375,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
index e9f75a9..251a1b8 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -560,8 +559,7 @@
     "infra_step": true,
     "name": "checkout d.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
index 6af0117..459811d 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -560,8 +559,7 @@
     "infra_step": true,
     "name": "checkout e5.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/repo_roller.expected/no-trigger-with-upstream.json b/recipes/repo_roller.expected/no-trigger-with-upstream.json
index db2cb3f..245db69 100644
--- a/recipes/repo_roller.expected/no-trigger-with-upstream.json
+++ b/recipes/repo_roller.expected/no-trigger-with-upstream.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -560,8 +559,7 @@
     "infra_step": true,
     "name": "checkout a.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1072,7 +1070,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1086,7 +1084,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1114,7 +1112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1144,7 +1142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1298,7 +1296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -1364,7 +1362,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -1410,7 +1408,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/success.json b/recipes/repo_roller.expected/success.json
index 4b5c87b..92200d3 100644
--- a/recipes/repo_roller.expected/success.json
+++ b/recipes/repo_roller.expected/success.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout a.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1770,7 +1768,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1796,7 +1794,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1836,7 +1834,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1878,7 +1876,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1939,7 +1937,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -1987,7 +1985,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2200,7 +2198,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2302,7 +2300,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -2360,7 +2358,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
index e60692e..a08367c 100644
--- a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
+++ b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/repo_roller.expected/upstream-not-set.json b/recipes/repo_roller.expected/upstream-not-set.json
index 2f56301..0b2dddc 100644
--- a/recipes/repo_roller.expected/upstream-not-set.json
+++ b/recipes/repo_roller.expected/upstream-not-set.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout manifest.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -944,8 +943,7 @@
     },
     "name": "checkout c.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1713,7 +1711,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
@@ -1739,7 +1737,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1779,7 +1777,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1821,7 +1819,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2047,7 +2045,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://host-review.googlesource.com",
@@ -2149,7 +2147,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://host-review.googlesource.com",
@@ -2207,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://host-review.googlesource.com",
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index 8c7b688..f1eb19e 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/static_checks.expected/do-not-submit.json b/recipes/static_checks.expected/do-not-submit.json
index 5be8550..9182202 100644
--- a/recipes/static_checks.expected/do-not-submit.json
+++ b/recipes/static_checks.expected/do-not-submit.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://chromium-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://chromium-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.commit-message-ignored.json b/recipes/static_checks.expected/docs.commit-message-ignored.json
index 2c840d0..bdc25c3 100644
--- a/recipes/static_checks.expected/docs.commit-message-ignored.json
+++ b/recipes/static_checks.expected/docs.commit-message-ignored.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.gerrit-comment.json b/recipes/static_checks.expected/docs.gerrit-comment.json
index e130082..89403e3 100644
--- a/recipes/static_checks.expected/docs.gerrit-comment.json
+++ b/recipes/static_checks.expected/docs.gerrit-comment.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.has_doc_changes.json b/recipes/static_checks.expected/docs.has_doc_changes.json
index 65e7ba6..dd27222 100644
--- a/recipes/static_checks.expected/docs.has_doc_changes.json
+++ b/recipes/static_checks.expected/docs.has_doc_changes.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.has_doc_changes_properties.json b/recipes/static_checks.expected/docs.has_doc_changes_properties.json
index 1647100..ce65ee2 100644
--- a/recipes/static_checks.expected/docs.has_doc_changes_properties.json
+++ b/recipes/static_checks.expected/docs.has_doc_changes_properties.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.no_doc_changes.json b/recipes/static_checks.expected/docs.no_doc_changes.json
index 32548ed..e4a54ab 100644
--- a/recipes/static_checks.expected/docs.no_doc_changes.json
+++ b/recipes/static_checks.expected/docs.no_doc_changes.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.no_doc_changes_properties.json b/recipes/static_checks.expected/docs.no_doc_changes_properties.json
index 790b448..dbf9866 100644
--- a/recipes/static_checks.expected/docs.no_doc_changes_properties.json
+++ b/recipes/static_checks.expected/docs.no_doc_changes_properties.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.owner.json b/recipes/static_checks.expected/docs.owner.json
index 3a41d0a..f9de39a 100644
--- a/recipes/static_checks.expected/docs.owner.json
+++ b/recipes/static_checks.expected/docs.owner.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.owners-files.json b/recipes/static_checks.expected/docs.owners-files.json
index 5b61671..5e002e3 100644
--- a/recipes/static_checks.expected/docs.owners-files.json
+++ b/recipes/static_checks.expected/docs.owners-files.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -186,7 +186,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/docs.revert.json b/recipes/static_checks.expected/docs.revert.json
index 24b6768..bf35d75 100644
--- a/recipes/static_checks.expected/docs.revert.json
+++ b/recipes/static_checks.expected/docs.revert.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.dry_run.json b/recipes/static_checks.expected/readability.dry_run.json
index 3308477..2cc042a 100644
--- a/recipes/static_checks.expected/readability.dry_run.json
+++ b/recipes/static_checks.expected/readability.dry_run.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.has_cpp_changes_approved.json b/recipes/static_checks.expected/readability.has_cpp_changes_approved.json
index 320d7da..6f12b81 100644
--- a/recipes/static_checks.expected/readability.has_cpp_changes_approved.json
+++ b/recipes/static_checks.expected/readability.has_cpp_changes_approved.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -189,7 +189,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.has_cpp_changes_justification.json b/recipes/static_checks.expected/readability.has_cpp_changes_justification.json
index e65b622..66a65dc 100644
--- a/recipes/static_checks.expected/readability.has_cpp_changes_justification.json
+++ b/recipes/static_checks.expected/readability.has_cpp_changes_justification.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.has_cpp_changes_no_label.json b/recipes/static_checks.expected/readability.has_cpp_changes_no_label.json
index 207a19a..eb5656a 100644
--- a/recipes/static_checks.expected/readability.has_cpp_changes_no_label.json
+++ b/recipes/static_checks.expected/readability.has_cpp_changes_no_label.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.has_cpp_changes_no_vote.json b/recipes/static_checks.expected/readability.has_cpp_changes_no_vote.json
index d4460a3..84e92a4 100644
--- a/recipes/static_checks.expected/readability.has_cpp_changes_no_vote.json
+++ b/recipes/static_checks.expected/readability.has_cpp_changes_no_vote.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.has_cpp_changes_recommended.json b/recipes/static_checks.expected/readability.has_cpp_changes_recommended.json
index eff1243..a27bfc1 100644
--- a/recipes/static_checks.expected/readability.has_cpp_changes_recommended.json
+++ b/recipes/static_checks.expected/readability.has_cpp_changes_recommended.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -189,7 +189,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/readability.no_cpp_changes.json b/recipes/static_checks.expected/readability.no_cpp_changes.json
index 93a74d8..60d44d6 100644
--- a/recipes/static_checks.expected/readability.no_cpp_changes.json
+++ b/recipes/static_checks.expected/readability.no_cpp_changes.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/regexp.fail-msg.json b/recipes/static_checks.expected/regexp.fail-msg.json
index 9fb23cd..da555c9 100644
--- a/recipes/static_checks.expected/regexp.fail-msg.json
+++ b/recipes/static_checks.expected/regexp.fail-msg.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/regexp.fail.json b/recipes/static_checks.expected/regexp.fail.json
index f42f199..16d7712 100644
--- a/recipes/static_checks.expected/regexp.fail.json
+++ b/recipes/static_checks.expected/regexp.fail.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/regexp.pass.json b/recipes/static_checks.expected/regexp.pass.json
index f07ca76..0788357 100644
--- a/recipes/static_checks.expected/regexp.pass.json
+++ b/recipes/static_checks.expected/regexp.pass.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.case.json b/recipes/static_checks.expected/requires.case.json
index 11144b3..d10ee61 100644
--- a/recipes/static_checks.expected/requires.case.json
+++ b/recipes/static_checks.expected/requires.case.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -269,7 +269,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.first-paragraph.json b/recipes/static_checks.expected/requires.first-paragraph.json
index dae508c..bc32ad4 100644
--- a/recipes/static_checks.expected/requires.first-paragraph.json
+++ b/recipes/static_checks.expected/requires.first-paragraph.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -269,7 +269,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.forbid.json b/recipes/static_checks.expected/requires.forbid.json
index 213fd98..fb8d1de 100644
--- a/recipes/static_checks.expected/requires.forbid.json
+++ b/recipes/static_checks.expected/requires.forbid.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -269,7 +269,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.middle-paragraph.json b/recipes/static_checks.expected/requires.middle-paragraph.json
index 6b13f7f..0aa9d9a 100644
--- a/recipes/static_checks.expected/requires.middle-paragraph.json
+++ b/recipes/static_checks.expected/requires.middle-paragraph.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -269,7 +269,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.multiple-warnings.json b/recipes/static_checks.expected/requires.multiple-warnings.json
index 5d1b47e..8ff7382 100644
--- a/recipes/static_checks.expected/requires.multiple-warnings.json
+++ b/recipes/static_checks.expected/requires.multiple-warnings.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -277,7 +277,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.no-requires.json b/recipes/static_checks.expected/requires.no-requires.json
index ea9f2dd..30bc98d 100644
--- a/recipes/static_checks.expected/requires.no-requires.json
+++ b/recipes/static_checks.expected/requires.no-requires.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.require.json b/recipes/static_checks.expected/requires.require.json
index ce292fe..38601c0 100644
--- a/recipes/static_checks.expected/requires.require.json
+++ b/recipes/static_checks.expected/requires.require.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -269,7 +269,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.required.json b/recipes/static_checks.expected/requires.required.json
index 010be7f..6973471 100644
--- a/recipes/static_checks.expected/requires.required.json
+++ b/recipes/static_checks.expected/requires.required.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -269,7 +269,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/requires.valid.json b/recipes/static_checks.expected/requires.valid.json
index 84d9f97..48e2c59 100644
--- a/recipes/static_checks.expected/requires.valid.json
+++ b/recipes/static_checks.expected/requires.valid.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/tested.tested-fail.json b/recipes/static_checks.expected/tested.tested-fail.json
index 88b1403..18f01fb 100644
--- a/recipes/static_checks.expected/tested.tested-fail.json
+++ b/recipes/static_checks.expected/tested.tested-fail.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/tested.tested-pass.json b/recipes/static_checks.expected/tested.tested-pass.json
index ab920b2..2fcb2e0 100644
--- a/recipes/static_checks.expected/tested.tested-pass.json
+++ b/recipes/static_checks.expected/tested.tested-pass.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/static_checks.expected/tested.tested-skip.json b/recipes/static_checks.expected/tested.tested-skip.json
index d6acff3..9332ef5 100644
--- a/recipes/static_checks.expected/tested.tested-skip.json
+++ b/recipes/static_checks.expected/tested.tested-skip.json
@@ -54,7 +54,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -79,7 +79,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/backwards.json b/recipes/submodule_roller.expected/backwards.json
index 7cdbf26..b0239a2 100644
--- a/recipes/submodule_roller.expected/backwards.json
+++ b/recipes/submodule_roller.expected/backwards.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/submodule_roller.expected/failure-cc-authors.json b/recipes/submodule_roller.expected/failure-cc-authors.json
index a164f77..ccafc4a 100644
--- a/recipes/submodule_roller.expected/failure-cc-authors.json
+++ b/recipes/submodule_roller.expected/failure-cc-authors.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1227,7 +1226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1269,7 +1268,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1329,7 +1328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1371,7 +1370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1468,7 +1467,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1516,7 +1515,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1730,7 +1729,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1832,7 +1831,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1893,7 +1892,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1942,7 +1941,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/name-not-found.json b/recipes/submodule_roller.expected/name-not-found.json
index f9105f6..600c5a0 100644
--- a/recipes/submodule_roller.expected/name-not-found.json
+++ b/recipes/submodule_roller.expected/name-not-found.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/submodule_roller.expected/no-revision.json b/recipes/submodule_roller.expected/no-revision.json
index 2b8f523..88508f4 100644
--- a/recipes/submodule_roller.expected/no-revision.json
+++ b/recipes/submodule_roller.expected/no-revision.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -628,7 +627,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -642,7 +641,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -670,7 +669,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -700,7 +699,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -746,7 +745,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -776,7 +775,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -824,7 +823,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -854,7 +853,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1045,7 +1044,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1111,7 +1110,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1157,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/relative-dot.json b/recipes/submodule_roller.expected/relative-dot.json
index a86b8f3..64b7bdf 100644
--- a/recipes/submodule_roller.expected/relative-dot.json
+++ b/recipes/submodule_roller.expected/relative-dot.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1227,7 +1226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1269,7 +1268,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1329,7 +1328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1371,7 +1370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1468,7 +1467,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1516,7 +1515,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1730,7 +1729,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1832,7 +1831,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1893,7 +1892,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1942,7 +1941,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/relative-dotdot-dotdot.json b/recipes/submodule_roller.expected/relative-dotdot-dotdot.json
index 8c02e25..5f349a9 100644
--- a/recipes/submodule_roller.expected/relative-dotdot-dotdot.json
+++ b/recipes/submodule_roller.expected/relative-dotdot-dotdot.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1227,7 +1226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1269,7 +1268,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1329,7 +1328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1371,7 +1370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1468,7 +1467,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1516,7 +1515,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1730,7 +1729,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1832,7 +1831,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1893,7 +1892,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1942,7 +1941,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/relative-dotdot.json b/recipes/submodule_roller.expected/relative-dotdot.json
index 6bbf16b..d065982 100644
--- a/recipes/submodule_roller.expected/relative-dotdot.json
+++ b/recipes/submodule_roller.expected/relative-dotdot.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1227,7 +1226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1269,7 +1268,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1329,7 +1328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1371,7 +1370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1468,7 +1467,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1516,7 +1515,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1730,7 +1729,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1832,7 +1831,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1893,7 +1892,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "set-review",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1942,7 +1941,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/success-sso-cc-authors.json b/recipes/submodule_roller.expected/success-sso-cc-authors.json
index ca5d12b..1db18ce 100644
--- a/recipes/submodule_roller.expected/success-sso-cc-authors.json
+++ b/recipes/submodule_roller.expected/success-sso-cc-authors.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1227,7 +1226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1269,7 +1268,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1329,7 +1328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1371,7 +1370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1468,7 +1467,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1516,7 +1515,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1730,7 +1729,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1832,7 +1831,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1890,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/too-many-skip-deps.json b/recipes/submodule_roller.expected/too-many-skip-deps.json
index d5ccb55..a9d7e23 100644
--- a/recipes/submodule_roller.expected/too-many-skip-deps.json
+++ b/recipes/submodule_roller.expected/too-many-skip-deps.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1223,7 +1222,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1265,7 +1264,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1319,7 +1318,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1361,7 +1360,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1415,7 +1414,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1457,7 +1456,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1511,7 +1510,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1553,7 +1552,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1607,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1649,7 +1648,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1703,7 +1702,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1745,7 +1744,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1799,7 +1798,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1841,7 +1840,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1895,7 +1894,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1937,7 +1936,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1991,7 +1990,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2033,7 +2032,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2098,7 +2097,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2146,7 +2145,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2387,7 +2386,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2489,7 +2488,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2547,7 +2546,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json b/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json
index df05ba5..6a8aea8 100644
--- a/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json
+++ b/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1061,7 +1060,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -1087,7 +1086,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1127,7 +1126,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1169,7 +1168,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1227,7 +1226,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1269,7 +1268,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1329,7 +1328,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1371,7 +1370,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1634,7 +1633,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1736,7 +1735,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1794,7 +1793,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/trigger-mismatch.json b/recipes/submodule_roller.expected/trigger-mismatch.json
index b937748..5b2eef7 100644
--- a/recipes/submodule_roller.expected/trigger-mismatch.json
+++ b/recipes/submodule_roller.expected/trigger-mismatch.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json b/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json
index ff237ee..3d4cf29 100644
--- a/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json
+++ b/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -628,7 +627,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -642,7 +641,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -670,7 +669,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -700,7 +699,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -746,7 +745,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -776,7 +775,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -824,7 +823,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -854,7 +853,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -946,7 +945,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1105,7 +1104,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1171,7 +1170,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1217,7 +1216,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-newrev-prop-cc-reviewers.json b/recipes/submodule_roller.expected/with-newrev-prop-cc-reviewers.json
index ae76315..31693ee 100644
--- a/recipes/submodule_roller.expected/with-newrev-prop-cc-reviewers.json
+++ b/recipes/submodule_roller.expected/with-newrev-prop-cc-reviewers.json
@@ -84,8 +84,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -617,7 +616,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/a1",
     "infra_step": true,
@@ -631,7 +630,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -659,7 +658,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -689,7 +688,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -735,7 +734,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -765,7 +764,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -813,7 +812,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -843,7 +842,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -928,7 +927,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -960,7 +959,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "account-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1109,7 +1108,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1175,7 +1174,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1221,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-already-applied.json b/recipes/submodule_roller.expected/with-requires-already-applied.json
index 76afd93..16a339a 100644
--- a/recipes/submodule_roller.expected/with-requires-already-applied.json
+++ b/recipes/submodule_roller.expected/with-requires-already-applied.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1554,7 +1553,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1930,7 +1929,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2032,7 +2031,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2090,7 +2089,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-child.json b/recipes/submodule_roller.expected/with-requires-child.json
index a688d09..bcd6229 100644
--- a/recipes/submodule_roller.expected/with-requires-child.json
+++ b/recipes/submodule_roller.expected/with-requires-child.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1555,7 +1554,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1616,7 +1615,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -2002,7 +2001,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2044,7 +2043,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2377,7 +2376,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2419,7 +2418,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2678,7 +2677,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2780,7 +2779,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2838,7 +2837,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-forbidden.json b/recipes/submodule_roller.expected/with-requires-forbidden.json
index 9396d9f..e46dcfd 100644
--- a/recipes/submodule_roller.expected/with-requires-forbidden.json
+++ b/recipes/submodule_roller.expected/with-requires-forbidden.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1554,7 +1553,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1598,7 +1597,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1839,7 +1838,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1941,7 +1940,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1999,7 +1998,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-loop.json b/recipes/submodule_roller.expected/with-requires-loop.json
index 5df5437..953e506 100644
--- a/recipes/submodule_roller.expected/with-requires-loop.json
+++ b/recipes/submodule_roller.expected/with-requires-loop.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1554,7 +1553,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1924,7 +1923,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1966,7 +1965,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2225,7 +2224,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2327,7 +2326,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2385,7 +2384,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-not-in-checkout.json b/recipes/submodule_roller.expected/with-requires-not-in-checkout.json
index 45d6198..19c63a1 100644
--- a/recipes/submodule_roller.expected/with-requires-not-in-checkout.json
+++ b/recipes/submodule_roller.expected/with-requires-not-in-checkout.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1554,7 +1553,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1828,7 +1827,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1930,7 +1929,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1988,7 +1987,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-parent.json b/recipes/submodule_roller.expected/with-requires-parent.json
index def098d..8a3f5f2 100644
--- a/recipes/submodule_roller.expected/with-requires-parent.json
+++ b/recipes/submodule_roller.expected/with-requires-parent.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1555,7 +1554,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1616,7 +1615,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -2002,7 +2001,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2044,7 +2043,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2405,7 +2404,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2507,7 +2506,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2565,7 +2564,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires-transitive.json b/recipes/submodule_roller.expected/with-requires-transitive.json
index de7550a..c256919 100644
--- a/recipes/submodule_roller.expected/with-requires-transitive.json
+++ b/recipes/submodule_roller.expected/with-requires-transitive.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1554,7 +1553,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1631,7 +1630,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -2001,7 +2000,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2043,7 +2042,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2376,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2418,7 +2417,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2706,7 +2705,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2808,7 +2807,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2866,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/submodule_roller.expected/with-requires.json b/recipes/submodule_roller.expected/with-requires.json
index 97e7f3b..64ef390 100644
--- a/recipes/submodule_roller.expected/with-requires.json
+++ b/recipes/submodule_roller.expected/with-requires.json
@@ -144,8 +144,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1167,7 +1166,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "cwd": "[START_DIR]/checkout/spam",
     "infra_step": true,
@@ -1193,7 +1192,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -1233,7 +1232,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1275,7 +1274,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1333,7 +1332,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1375,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1436,7 +1435,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1478,7 +1477,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1554,7 +1553,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://foo-review.googlesource.com",
@@ -1924,7 +1923,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1966,7 +1965,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2225,7 +2224,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2327,7 +2326,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2385,7 +2384,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 33a1aed..81daa77 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 69e9717..7bdf127 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/target_to_git.expected/success.json b/recipes/target_to_git.expected/success.json
index f77ba5e..e295edb 100644
--- a/recipes/target_to_git.expected/success.json
+++ b/recipes/target_to_git.expected/success.json
@@ -78,7 +78,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,7 +103,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -142,7 +142,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -338,8 +338,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1334,8 +1333,7 @@
     },
     "name": "checkout generated.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -2283,7 +2281,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -2385,7 +2383,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index f03951f..2a12060 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -61,7 +61,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -86,7 +86,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -125,7 +125,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -317,7 +317,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -377,7 +377,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -419,7 +419,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -656,8 +656,7 @@
     },
     "name": "checkout.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/tokendb_check.expected/comment.json b/recipes/tokendb_check.expected/comment.json
index f1fb039..c37e319 100644
--- a/recipes/tokendb_check.expected/comment.json
+++ b/recipes/tokendb_check.expected/comment.json
@@ -61,7 +61,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -86,7 +86,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -125,7 +125,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index f03951f..2a12060 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -61,7 +61,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -86,7 +86,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -125,7 +125,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -317,7 +317,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -377,7 +377,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -419,7 +419,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -656,8 +656,7 @@
     },
     "name": "checkout.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index 7421fc3..3e452d7 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -61,7 +61,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -86,7 +86,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -125,7 +125,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -183,7 +183,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "list-change-comments",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -317,7 +317,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -377,7 +377,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -419,7 +419,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -656,8 +656,7 @@
     },
     "name": "checkout.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index eaee0b1..5629683 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -848,7 +847,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -914,7 +913,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -960,7 +959,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-abandon",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_updater.expected/separate-repo.json b/recipes/tokendb_updater.expected/separate-repo.json
index 867771a..0ac4919 100644
--- a/recipes/tokendb_updater.expected/separate-repo.json
+++ b/recipes/tokendb_updater.expected/separate-repo.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -805,8 +804,7 @@
     "infra_step": true,
     "name": "checkout tokendb.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1296,7 +1294,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -1362,7 +1360,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index 6aa32cc..c10146a 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -848,7 +847,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -914,7 +913,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index ed9f88b..98dd27a 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -862,7 +861,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -928,7 +927,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index 2aa15ac..5f81c10 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -845,7 +844,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
@@ -858,7 +857,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -889,7 +888,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:21.500000Z",
       "-o",
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index cef915a..5f613d0 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -72,7 +72,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "checkout pigweed.change data.ensure gerrit.install path/to/gerrit.ensure package directory",
@@ -85,7 +85,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -112,7 +112,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -236,8 +236,7 @@
     "infra_step": true,
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -845,7 +844,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "name": "ensure gsutil.install path/to/gsutil.ensure package directory",
@@ -858,7 +857,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -889,7 +888,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:21.500000Z",
       "-o",
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index b1c4e64..1284699 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -85,7 +85,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -110,7 +110,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
       "-ensure-file",
       "path/to/gerrit version:pinned-version",
       "-max-threads",
@@ -149,7 +149,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -194,7 +194,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -254,7 +254,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-query",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -296,7 +296,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/cipd/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
       "change-detail",
       "-host",
       "https://pigweed-review.googlesource.com",
@@ -533,8 +533,7 @@
     },
     "name": "checkout pigweed.cache.write guard file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@.GUARD_FILE@@@"
+      "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
@@ -1691,7 +1690,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1716,7 +1715,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version",
       "-ensure-file",
       "path/to/gsutil version:pinned-version",
       "-max-threads",
@@ -1759,7 +1758,7 @@
       "-vpython-spec",
       "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "-u",
-      "[CACHE]/cipd/path/to/gsutil/version%3Apinned-version/gsutil",
+      "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:21.500000Z",
       "-o",