diff --git a/.azure/pipelines/build-and-test.yml b/.azure/pipelines/build-and-test.yml
index 62071dc..f849e10 100644
--- a/.azure/pipelines/build-and-test.yml
+++ b/.azure/pipelines/build-and-test.yml
@@ -101,13 +101,13 @@ jobs:
       continueOnError: true
       inputs:
         securityNamespace: cache
-        key: $(Agent.OS) | $(cache_name) | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS)
+        key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS)
         path: $(CCACHE_DIR)
         restoreKeys: |
-          $(Agent.OS) | $(cache_name) | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY)
-          $(Agent.OS) | $(cache_name) | $(TS_YEAR) | $(TS_MONTH)
-          $(Agent.OS) | $(cache_name) | $(TS_YEAR)
-          $(Agent.OS) | $(cache_name)
+          $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY)
+          $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH)
+          $(Agent.OS) | "$(cache_name)" | $(TS_YEAR)
+          $(Agent.OS) | "$(cache_name)"
 
     - bash: |
         WORKSPACE=$(Pipeline.Workspace)/s
@@ -159,5 +159,5 @@ jobs:
       continueOnError: true
       inputs:
         targetPath: $(OUTPUT_DIR)
-        artifact: 'foo-output-$(setup)'
+        artifact: foo-output-$(name)
         publishLocation: 'pipeline'