diff --git a/recipe_modules/environment/tests/full.expected/doctor-fail.json b/recipe_modules/environment/tests/full.expected/doctor-fail.json
index cd69b3f..7b5ec2e 100644
--- a/recipe_modules/environment/tests/full.expected/doctor-fail.json
+++ b/recipe_modules/environment/tests/full.expected/doctor-fail.json
@@ -301,6 +301,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index 5e4a297..5795bac 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -529,6 +529,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipe_modules/environment/tests/full.expected/override-cas.json b/recipe_modules/environment/tests/full.expected/override-cas.json
index 30e4619..ebc6082 100644
--- a/recipe_modules/environment/tests/full.expected/override-cas.json
+++ b/recipe_modules/environment/tests/full.expected/override-cas.json
@@ -299,6 +299,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipe_modules/environment/tests/full.expected/override-cipd.json b/recipe_modules/environment/tests/full.expected/override-cipd.json
index 7079b00..d181443 100644
--- a/recipe_modules/environment/tests/full.expected/override-cipd.json
+++ b/recipe_modules/environment/tests/full.expected/override-cipd.json
@@ -299,6 +299,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index 16d821a..ce23f7a 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -299,6 +299,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
index 664702b..aaa0404 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
@@ -446,6 +446,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_0/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_0/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_0/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_0/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_0/links.json@@@",
@@ -1565,6 +1566,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/program_1/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
index 8fb2447..f93b249 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
@@ -445,6 +445,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1574,6 +1575,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
index a2ee8c0..eca3fb3 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
@@ -445,6 +445,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1574,6 +1575,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
index dfb0a50..4fd6f67 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
@@ -608,6 +608,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1780,6 +1781,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
index 5ab5b62..0555100 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
@@ -445,6 +445,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1574,6 +1575,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/long.json b/recipe_modules/pw_presubmit/tests/full.expected/long.json
index 5121ad0..6ccfe8f 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/long.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/long.json
@@ -437,6 +437,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1558,6 +1559,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/medium.json b/recipe_modules/pw_presubmit/tests/full.expected/medium.json
index 096fd89..d56c4a9 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/medium.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/medium.json
@@ -437,6 +437,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1558,6 +1559,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
index 2c1559e..93c0742 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
@@ -435,6 +435,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_0/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_0/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_0/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_0/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_0/links.json@@@",
@@ -1556,6 +1557,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/full_1/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/step.json b/recipe_modules/pw_presubmit/tests/full.expected/step.json
index 58cbf55..4541384 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/step.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/step.json
@@ -445,6 +445,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step1/links.json@@@",
@@ -1572,6 +1573,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/step2/links.json@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/substep.json b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
index cd14b0c..6cd90fd 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/substep.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
@@ -326,6 +326,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/composite/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/composite/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/composite/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/composite/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/p/composite/links.json@@@",
diff --git a/recipe_modules/save_logs/api.py b/recipe_modules/save_logs/api.py
index 1aee7af..ae8fe4e 100644
--- a/recipe_modules/save_logs/api.py
+++ b/recipe_modules/save_logs/api.py
@@ -63,6 +63,7 @@
                             'failure-summary.log',
                             'links.json',
                             'links.json',
+                            'CMakeCache.txt',
                         ]
 
                     for dir in dirs:
@@ -76,6 +77,12 @@
                             )
                         )
 
+            def ignore(path):
+                ignored_names = set(['CMakeCache.txt'])
+                return self.m.path.basename(path) in ignored_names
+
+            found_files = set(x for x in found_files if not ignore(x))
+
             # Read these files and discard them so contents will be in logdog.
             ninja_log = None
             failure_summary_log = None
diff --git a/recipe_modules/save_logs/tests/full.expected/full.json b/recipe_modules/save_logs/tests/full.expected/full.json
index 75235ed..58fd92d 100644
--- a/recipe_modules/save_logs/tests/full.expected/full.json
+++ b/recipe_modules/save_logs/tests/full.expected/full.json
@@ -152,6 +152,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/checkout/links.json@@@",
diff --git a/recipes/docs_builder.expected/docs-postsubmit.json b/recipes/docs_builder.expected/docs-postsubmit.json
index 34a7fe6..675977c 100644
--- a/recipes/docs_builder.expected/docs-postsubmit.json
+++ b/recipes/docs_builder.expected/docs-postsubmit.json
@@ -1226,6 +1226,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/links.json@@@",
diff --git a/recipes/docs_builder.expected/docs-presubmit.json b/recipes/docs_builder.expected/docs-presubmit.json
index f6acd7d..21b3a86 100644
--- a/recipes/docs_builder.expected/docs-presubmit.json
+++ b/recipes/docs_builder.expected/docs-presubmit.json
@@ -2158,6 +2158,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/links.json@@@",
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index 6fe672f..974e151 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -1104,6 +1104,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 27c314f..3f3ecef 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -1743,6 +1743,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 92c172d..241a796 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -1740,6 +1740,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/environment/links.json@@@",
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index f74b206..68308ac 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -1738,6 +1738,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]\\environment\\links.json@@@",
diff --git a/recipes/pw_presubmit.expected/one_step.json b/recipes/pw_presubmit.expected/one_step.json
index 81f2f29..83f1a51 100644
--- a/recipes/pw_presubmit.expected/one_step.json
+++ b/recipes/pw_presubmit.expected/one_step.json
@@ -2158,6 +2158,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/links.json@@@",
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index f097caa..fc97b7c 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -1893,6 +1893,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/release/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/release/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/release/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/release/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/release/links.json@@@",
diff --git a/recipes/pw_presubmit.expected/two_steps.json b/recipes/pw_presubmit.expected/two_steps.json
index d8e3330..519d83e 100644
--- a/recipes/pw_presubmit.expected/two_steps.json
+++ b/recipes/pw_presubmit.expected/two_steps.json
@@ -2164,6 +2164,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step1/links.json@@@",
@@ -3347,6 +3348,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step2/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step2/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step2/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step2/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step2/links.json@@@",
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index cdbc63d..7586329 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -1247,6 +1247,7 @@
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/.ninja_log@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/CMakeCache.txt@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/coverage_reports/foo.tar.gz@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/failure-summary.log@@@",
       "@@@STEP_LOG_LINE@glob@[START_DIR]/co/p/step/links.json@@@",