diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 86c83c39a1..33dfe83206 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -30,10 +30,9 @@ jobs:
         displayName: Install Node.js
       - task: Cache@2
         inputs:
-          key: yarn | $(Agent.OS) | yarn.lock
+          key: 'yarn | "$(Agent.OS)"" | yarn.lock'
           restoreKeys: |
             yarn | "$(Agent.OS)"
-            yarn
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
       - script: make node_modules
@@ -70,10 +69,9 @@ jobs:
         displayName: Install Node.js
       - task: Cache@2
         inputs:
-          key: yarn | $(Agent.OS) | yarn.lock
+          key: 'yarn | "$(Agent.OS)" | yarn.lock'
           restoreKeys: |
             yarn | "$(Agent.OS)"
-            yarn
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
       - script: make node_modules
@@ -116,10 +114,9 @@ jobs:
         displayName: Install Node.js
       - task: Cache@2
         inputs:
-          key: yarn | $(Agent.OS) | yarn.lock
+          key: 'yarn | "$(Agent.OS)" | yarn.lock'
           restoreKeys: |
             yarn | "$(Agent.OS)"
-            yarn
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
       - script: make node_modules