diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ff13e6165..aaa2b6ea7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,7 @@ jobs:
     displayName: 'Install Yarn'
   - task: CacheBeta@1
     inputs:
-      key: yarn1 | $(Agent.OS) | yarn.lock
+      key: yarn2 | $(Agent.OS) | yarn.lock
       path: node_modules
     displayName: Cache Yarn packages
   - script: yarn --frozen-lockfile
@@ -58,7 +58,7 @@ jobs:
     displayName: 'Install Node.js'
   - task: CacheBeta@1
     inputs:
-      key: yarn1 | $(Agent.OS) | yarn.lock
+      key: yarn2 | $(Agent.OS) | yarn.lock
       path: node_modules
     displayName: Cache Yarn packages
   - script: yarn --frozen-lockfile
@@ -80,7 +80,7 @@ jobs:
     displayName: 'Install Node.js'
   - task: CacheBeta@1
     inputs:
-      key: yarn1 | $(Agent.OS) | yarn.lock
+      key: yarn2 | $(Agent.OS) | yarn.lock
       path: node_modules
     displayName: Cache Yarn packages
   - script: yarn --frozen-lockfile
@@ -102,11 +102,6 @@ jobs:
     inputs:
       versionSpec: '1.x'
     displayName: 'Install Yarn'
-  - task: CacheBeta@1
-    inputs:
-      key: yarn1 | $(Agent.OS) | yarn.lock
-      path: node_modules
-    displayName: Cache Yarn packages
   - script: yarn --frozen-lockfile
     displayName: 'Install dependencies and build'
   - script: yarn add puppeteer
@@ -125,11 +120,6 @@ jobs:
     inputs:
       versionSpec: '8.x'
     displayName: 'Install Node.js'
-  - task: CacheBeta@1
-    inputs:
-      key: yarn1 | $(Agent.OS) | yarn.lock
-      path: node_modules
-    displayName: Cache Yarn packages
   - script: yarn --frozen-lockfile
     displayName: 'Install dependencies and build'
   - script: yarn add puppeteer
@@ -161,7 +151,7 @@ jobs:
     displayName: 'Install Yarn'
   - task: CacheBeta@1
     inputs:
-      key: yarn1 | $(Agent.OS) | yarn.lock
+      key: yarn2 | $(Agent.OS) | yarn.lock
       path: node_modules
     displayName: Cache Yarn packages
   - script: yarn --frozen-lockfile