diff --git a/recipe_modules/infra_paths/example.expected/basic.json b/recipe_modules/infra_paths/example.expected/basic.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/basic.json
+++ b/recipe_modules/infra_paths/example.expected/basic.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_buildbot_linux.json b/recipe_modules/infra_paths/example.expected/paths_buildbot_linux.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_buildbot_linux.json
+++ b/recipe_modules/infra_paths/example.expected/paths_buildbot_linux.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_buildbot_mac.json b/recipe_modules/infra_paths/example.expected/paths_buildbot_mac.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_buildbot_mac.json
+++ b/recipe_modules/infra_paths/example.expected/paths_buildbot_mac.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_buildbot_win.json b/recipe_modules/infra_paths/example.expected/paths_buildbot_win.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_buildbot_win.json
+++ b/recipe_modules/infra_paths/example.expected/paths_buildbot_win.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_kitchen_linux.json b/recipe_modules/infra_paths/example.expected/paths_kitchen_linux.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_kitchen_linux.json
+++ b/recipe_modules/infra_paths/example.expected/paths_kitchen_linux.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_kitchen_mac.json b/recipe_modules/infra_paths/example.expected/paths_kitchen_mac.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_kitchen_mac.json
+++ b/recipe_modules/infra_paths/example.expected/paths_kitchen_mac.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_kitchen_win.json b/recipe_modules/infra_paths/example.expected/paths_kitchen_win.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_kitchen_win.json
+++ b/recipe_modules/infra_paths/example.expected/paths_kitchen_win.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_swarmbucket_linux.json b/recipe_modules/infra_paths/example.expected/paths_swarmbucket_linux.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_swarmbucket_linux.json
+++ b/recipe_modules/infra_paths/example.expected/paths_swarmbucket_linux.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_swarmbucket_mac.json b/recipe_modules/infra_paths/example.expected/paths_swarmbucket_mac.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_swarmbucket_mac.json
+++ b/recipe_modules/infra_paths/example.expected/paths_swarmbucket_mac.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.expected/paths_swarmbucket_win.json b/recipe_modules/infra_paths/example.expected/paths_swarmbucket_win.json
index 46c37186d..75aa33833 100644
--- a/recipe_modules/infra_paths/example.expected/paths_swarmbucket_win.json
+++ b/recipe_modules/infra_paths/example.expected/paths_swarmbucket_win.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {
diff --git a/recipe_modules/infra_paths/example.py b/recipe_modules/infra_paths/example.py
index d1d33a50c..2cca4c791 100644
--- a/recipe_modules/infra_paths/example.py
+++ b/recipe_modules/infra_paths/example.py
@@ -13,7 +13,7 @@ DEPS = [
 
 def RunSteps(api):
   api.step('show cache path', [])
-  api.step.active_result.presentation.step_text = str(api.path['git_cache'])
+  api.step.active_result.presentation.step_text = str(api.path['cache'])
 
 
 def GenTests(api):
diff --git a/recipe_modules/infra_paths/path_config.py b/recipe_modules/infra_paths/path_config.py
index b3880106d..4ec1bc791 100644
--- a/recipe_modules/infra_paths/path_config.py
+++ b/recipe_modules/infra_paths/path_config.py
@@ -53,8 +53,6 @@ def infra_kitchen(c):
       c.base_paths[path] = c.base_paths['cache'] + (path,)
 
 
-@CONFIG_CTX()
+@CONFIG_CTX(includes=['infra_buildbot'])
 def infra_swarmbucket(c):
-  c.base_paths['root'] = c.CURRENT_WORKING_DIR
   c.base_paths['git_cache'] = c.base_paths['root'] + ('git_cache',)
-  c.base_paths['goma_cache'] = c.base_paths['root'] + ('goma_cache',)