diff --git a/build/azure-pipelines/product-build-pr-cache.yml b/build/azure-pipelines/product-build-pr-cache.yml
new file mode 100644
index 00000000000..067afa7492d
--- /dev/null
+++ b/build/azure-pipelines/product-build-pr-cache.yml
@@ -0,0 +1,59 @@
+steps:
+  - checkout: self
+    fetchDepth: 1
+    retryCountOnTaskFailure: 3
+
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "16.x"
+
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
+
+  - task: Cache@2
+    inputs:
+      key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      set -e
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    retryCountOnTaskFailure: 3
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
+
+  - script: |
+      set -e
+      for i in {1..3}; do # try 3 times, for Terrapin
+        yarn --frozen-lockfile --check-files && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Install dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml
index 62eb8ca55cb..8f06bcfd09c 100644
--- a/build/azure-pipelines/product-build-pr.yml
+++ b/build/azure-pipelines/product-build-pr.yml
@@ -13,6 +13,8 @@ variables:
     value: true
   - name: ENABLE_TERRAPIN
     value: false
+  - name: VSCODE_CIBUILD
+    value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
   - name: VSCODE_PUBLISH
     value: false
   - name: VSCODE_QUALITY
@@ -21,162 +23,173 @@ variables:
     value: false
 
 stages:
-  - stage: Compile
-    displayName: Compile & Hygiene
-    jobs:
-      - job: Compile
-        displayName: Compile & Hygiene
-        pool: vscode-1es-vscode-linux-20.04
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: product-compile.yml
-            parameters:
-              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+  - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+    - stage: MaintainNodeModulesCache
+      displayName: Maintain node_modules cache
+      jobs:
+        - job: MaintainNodeModulesCache
+          displayName: Maintain node_modules cache
+          pool: vscode-1es-vscode-linux-20.04
+          steps:
+            - template: product-build-pr-cache.yml
 
-  - stage: Test
-    dependsOn: []
-    jobs:
-      - job: Linuxx64UnitTest
-        displayName: Linux (Unit Tests)
-        pool: vscode-1es-vscode-linux-20.04
-        # container: vscode-bionic-x64
-        timeoutInMinutes: 60
-        variables:
-          VSCODE_ARCH: x64
-          NPM_ARCH: x64
-          DISPLAY: ":10"
-        steps:
-          - template: linux/product-build-linux-client.yml
-            parameters:
-              VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-              VSCODE_RUN_UNIT_TESTS: true
-              VSCODE_RUN_INTEGRATION_TESTS: false
-              VSCODE_RUN_SMOKE_TESTS: false
-      - job: Linuxx64IntegrationTest
-        displayName: Linux (Integration Tests)
-        pool: vscode-1es-vscode-linux-20.04
-        # container: vscode-bionic-x64
-        timeoutInMinutes: 60
-        variables:
-          VSCODE_ARCH: x64
-          NPM_ARCH: x64
-          DISPLAY: ":10"
-        steps:
-          - template: linux/product-build-linux-client.yml
-            parameters:
-              VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-              VSCODE_RUN_UNIT_TESTS: false
-              VSCODE_RUN_INTEGRATION_TESTS: true
-              VSCODE_RUN_SMOKE_TESTS: false
-      - job: Linuxx64SmokeTest
-        displayName: Linux (Smoke Tests)
-        pool: vscode-1es-vscode-linux-20.04
-        # container: vscode-bionic-x64
-        timeoutInMinutes: 60
-        variables:
-          VSCODE_ARCH: x64
-          NPM_ARCH: x64
-          DISPLAY: ":10"
-        steps:
-          - template: linux/product-build-linux-client.yml
-            parameters:
-              VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-              VSCODE_RUN_UNIT_TESTS: false
-              VSCODE_RUN_INTEGRATION_TESTS: false
-              VSCODE_RUN_SMOKE_TESTS: true
+  - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}:
+    - stage: Compile
+      displayName: Compile & Hygiene
+      jobs:
+        - job: Compile
+          displayName: Compile & Hygiene
+          pool: vscode-1es-vscode-linux-20.04
+          variables:
+            VSCODE_ARCH: x64
+          steps:
+            - template: product-compile.yml
+              parameters:
+                VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
-      # - job: macOSUnitTest
-      #   displayName: macOS (Unit Tests)
-      #   pool:
-      #     vmImage: macOS-latest
-      #   timeoutInMinutes: 60
-      #   variables:
-      #     BUILDSECMON_OPT_IN: true
-      #     VSCODE_ARCH: x64
-      #   steps:
-      #     - template: darwin/product-build-darwin.yml
-      #       parameters:
-      #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-      #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-      #         VSCODE_RUN_UNIT_TESTS: true
-      #         VSCODE_RUN_INTEGRATION_TESTS: false
-      #         VSCODE_RUN_SMOKE_TESTS: false
-      # - job: macOSIntegrationTest
-      #   displayName: macOS (Integration Tests)
-      #   pool:
-      #     vmImage: macOS-latest
-      #   timeoutInMinutes: 60
-      #   variables:
-      #     BUILDSECMON_OPT_IN: true
-      #     VSCODE_ARCH: x64
-      #   steps:
-      #     - template: darwin/product-build-darwin.yml
-      #       parameters:
-      #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-      #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-      #         VSCODE_RUN_UNIT_TESTS: false
-      #         VSCODE_RUN_INTEGRATION_TESTS: true
-      #         VSCODE_RUN_SMOKE_TESTS: false
-      # - job: macOSSmokeTest
-      #   displayName: macOS (Smoke Tests)
-      #   pool:
-      #     vmImage: macOS-latest
-      #   timeoutInMinutes: 60
-      #   variables:
-      #     BUILDSECMON_OPT_IN: true
-      #     VSCODE_ARCH: x64
-      #   steps:
-      #     - template: darwin/product-build-darwin.yml
-      #       parameters:
-      #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-      #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-      #         VSCODE_RUN_UNIT_TESTS: false
-      #         VSCODE_RUN_INTEGRATION_TESTS: false
-      #         VSCODE_RUN_SMOKE_TESTS: true
+    - stage: Test
+      dependsOn: []
+      jobs:
+        - job: Linuxx64UnitTest
+          displayName: Linux (Unit Tests)
+          pool: vscode-1es-vscode-linux-20.04
+          # container: vscode-bionic-x64
+          timeoutInMinutes: 60
+          variables:
+            VSCODE_ARCH: x64
+            NPM_ARCH: x64
+            DISPLAY: ":10"
+          steps:
+            - template: linux/product-build-linux-client.yml
+              parameters:
+                VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                VSCODE_RUN_UNIT_TESTS: true
+                VSCODE_RUN_INTEGRATION_TESTS: false
+                VSCODE_RUN_SMOKE_TESTS: false
+        - job: Linuxx64IntegrationTest
+          displayName: Linux (Integration Tests)
+          pool: vscode-1es-vscode-linux-20.04
+          # container: vscode-bionic-x64
+          timeoutInMinutes: 60
+          variables:
+            VSCODE_ARCH: x64
+            NPM_ARCH: x64
+            DISPLAY: ":10"
+          steps:
+            - template: linux/product-build-linux-client.yml
+              parameters:
+                VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                VSCODE_RUN_UNIT_TESTS: false
+                VSCODE_RUN_INTEGRATION_TESTS: true
+                VSCODE_RUN_SMOKE_TESTS: false
+        - job: Linuxx64SmokeTest
+          displayName: Linux (Smoke Tests)
+          pool: vscode-1es-vscode-linux-20.04
+          # container: vscode-bionic-x64
+          timeoutInMinutes: 60
+          variables:
+            VSCODE_ARCH: x64
+            NPM_ARCH: x64
+            DISPLAY: ":10"
+          steps:
+            - template: linux/product-build-linux-client.yml
+              parameters:
+                VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                VSCODE_RUN_UNIT_TESTS: false
+                VSCODE_RUN_INTEGRATION_TESTS: false
+                VSCODE_RUN_SMOKE_TESTS: true
 
-      # - job: WindowsUnitTests
-      #   displayName: Windows (Unit Tests)
-      #   pool: vscode-1es-vscode-windows-2019
-      #   timeoutInMinutes: 60
-      #   variables:
-      #     VSCODE_ARCH: x64
-      #   steps:
-      #     - template: win32/product-build-win32.yml
-      #       parameters:
-      #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-      #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-      #         VSCODE_RUN_UNIT_TESTS: true
-      #         VSCODE_RUN_INTEGRATION_TESTS: false
-      #         VSCODE_RUN_SMOKE_TESTS: false
-      # - job: WindowsIntegrationTests
-      #   displayName: Windows (Integration Tests)
-      #   pool: vscode-1es-vscode-windows-2019
-      #   timeoutInMinutes: 60
-      #   variables:
-      #     VSCODE_ARCH: x64
-      #   steps:
-      #     - template: win32/product-build-win32.yml
-      #       parameters:
-      #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-      #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-      #         VSCODE_RUN_UNIT_TESTS: false
-      #         VSCODE_RUN_INTEGRATION_TESTS: true
-      #         VSCODE_RUN_SMOKE_TESTS: false
-      # - job: WindowsSmokeTests
-      #   displayName: Windows (Smoke Tests)
-      #   pool: vscode-1es-vscode-windows-2019
-      #   timeoutInMinutes: 60
-      #   variables:
-      #     VSCODE_ARCH: x64
-      #   steps:
-      #     - template: win32/product-build-win32.yml
-      #       parameters:
-      #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-      #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-      #         VSCODE_RUN_UNIT_TESTS: false
-      #         VSCODE_RUN_INTEGRATION_TESTS: false
-      #         VSCODE_RUN_SMOKE_TESTS: true
+        # - job: macOSUnitTest
+        #   displayName: macOS (Unit Tests)
+        #   pool:
+        #     vmImage: macOS-latest
+        #   timeoutInMinutes: 60
+        #   variables:
+        #     BUILDSECMON_OPT_IN: true
+        #     VSCODE_ARCH: x64
+        #   steps:
+        #     - template: darwin/product-build-darwin.yml
+        #       parameters:
+        #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+        #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+        #         VSCODE_RUN_UNIT_TESTS: true
+        #         VSCODE_RUN_INTEGRATION_TESTS: false
+        #         VSCODE_RUN_SMOKE_TESTS: false
+        # - job: macOSIntegrationTest
+        #   displayName: macOS (Integration Tests)
+        #   pool:
+        #     vmImage: macOS-latest
+        #   timeoutInMinutes: 60
+        #   variables:
+        #     BUILDSECMON_OPT_IN: true
+        #     VSCODE_ARCH: x64
+        #   steps:
+        #     - template: darwin/product-build-darwin.yml
+        #       parameters:
+        #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+        #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+        #         VSCODE_RUN_UNIT_TESTS: false
+        #         VSCODE_RUN_INTEGRATION_TESTS: true
+        #         VSCODE_RUN_SMOKE_TESTS: false
+        # - job: macOSSmokeTest
+        #   displayName: macOS (Smoke Tests)
+        #   pool:
+        #     vmImage: macOS-latest
+        #   timeoutInMinutes: 60
+        #   variables:
+        #     BUILDSECMON_OPT_IN: true
+        #     VSCODE_ARCH: x64
+        #   steps:
+        #     - template: darwin/product-build-darwin.yml
+        #       parameters:
+        #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+        #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+        #         VSCODE_RUN_UNIT_TESTS: false
+        #         VSCODE_RUN_INTEGRATION_TESTS: false
+        #         VSCODE_RUN_SMOKE_TESTS: true
+
+        # - job: WindowsUnitTests
+        #   displayName: Windows (Unit Tests)
+        #   pool: vscode-1es-vscode-windows-2019
+        #   timeoutInMinutes: 60
+        #   variables:
+        #     VSCODE_ARCH: x64
+        #   steps:
+        #     - template: win32/product-build-win32.yml
+        #       parameters:
+        #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+        #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+        #         VSCODE_RUN_UNIT_TESTS: true
+        #         VSCODE_RUN_INTEGRATION_TESTS: false
+        #         VSCODE_RUN_SMOKE_TESTS: false
+        # - job: WindowsIntegrationTests
+        #   displayName: Windows (Integration Tests)
+        #   pool: vscode-1es-vscode-windows-2019
+        #   timeoutInMinutes: 60
+        #   variables:
+        #     VSCODE_ARCH: x64
+        #   steps:
+        #     - template: win32/product-build-win32.yml
+        #       parameters:
+        #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+        #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+        #         VSCODE_RUN_UNIT_TESTS: false
+        #         VSCODE_RUN_INTEGRATION_TESTS: true
+        #         VSCODE_RUN_SMOKE_TESTS: false
+        # - job: WindowsSmokeTests
+        #   displayName: Windows (Smoke Tests)
+        #   pool: vscode-1es-vscode-windows-2019
+        #   timeoutInMinutes: 60
+        #   variables:
+        #     VSCODE_ARCH: x64
+        #   steps:
+        #     - template: win32/product-build-win32.yml
+        #       parameters:
+        #         VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+        #         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+        #         VSCODE_RUN_UNIT_TESTS: false
+        #         VSCODE_RUN_INTEGRATION_TESTS: false
+        #         VSCODE_RUN_SMOKE_TESTS: true