diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 3b889db65be..916e5cef3ce 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -4,7 +4,6 @@ steps:
       echo -n $BUILD_SOURCEVERSION > .build/commit
       echo -n $VSCODE_QUALITY > .build/quality
       echo -n $ENABLE_TERRAPIN > .build/terrapin
-      echo -n $(VSCODE_ARCH) > .build/arch
     displayName: Prepare compilation cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
@@ -60,6 +59,10 @@ steps:
     timeoutInMinutes: 5
     condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
 
+  - script: |
+      echo -n $(VSCODE_ARCH) > .build/arch
+    displayName: Prepare yarn cache flags
+
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
     inputs:
       keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
diff --git a/build/azure-pipelines/product-dependencies.yml b/build/azure-pipelines/product-dependencies.yml
index 133ce57bf68..01eb347cae5 100644
--- a/build/azure-pipelines/product-dependencies.yml
+++ b/build/azure-pipelines/product-dependencies.yml
@@ -1,35 +1,36 @@
 steps:
   - script: |
       mkdir -p .build
+      echo -n $BUILD_SOURCEVERSION > .build/commit
+      echo -n $VSCODE_QUALITY > .build/quality
       echo -n $ENABLE_TERRAPIN > .build/terrapin
-      echo -n $(VSCODE_ARCH) > .build/arch
-    displayName: Prepare cache flags
+    displayName: Prepare compilation cache flag
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
     inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
+      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
       vstsFeed: "npm-vscode"
-      alias: "Dependencies"
+      platformIndependent: true
+      alias: "Compilation"
       dryRun: true
-    displayName: Check dependencies cache
 
   - task: NodeTool@0
     inputs:
       versionSpec: "12.18.3"
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
       versionSpec: "1.x"
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       set -e
@@ -42,7 +43,7 @@ steps:
       git config user.email "vscode@microsoft.com"
       git config user.name "VSCode"
     displayName: Prepare tooling
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       set -e
@@ -50,13 +51,24 @@ steps:
       git fetch distro
       git merge $(node -p "require('./package.json').distro")
     displayName: Merge distro
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       npx https://aka.ms/enablesecurefeed standAlone
     displayName: Switch to Terrapin packages
     timeoutInMinutes: 5
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+
+  - script: |
+      echo -n $(VSCODE_ARCH) > .build/arch
+    displayName: Prepare yarn cache flags
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    inputs:
+      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+      vstsFeed: "npm-vscode"
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       set -e
@@ -70,11 +82,11 @@ steps:
         echo "Yarn failed $i, trying again..."
       done
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
 
   - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
     inputs:
       keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
       targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
       vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheExists-Dependencies'], 'true'))
+    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))