diff --git a/.ci/azure-pipelines-build.yml b/.ci/azure-pipelines-build.yml
index 026afe76a6..fb08254216 100644
--- a/.ci/azure-pipelines-build.yml
+++ b/.ci/azure-pipelines-build.yml
@@ -19,15 +19,15 @@ jobs:
       versionSpec: '12.x'
 
   - task: Cache@2
-    displayName: 'Check Cache'
+    displayName: 'Cache node_modules'
     inputs:
       key: 'yarn | yarn.lock'
       path: 'node_modules'
-      cacheHitVar: CACHE_RESTORED
 
   - script: 'yarn install --frozen-lockfile'
     displayName: 'Install Dependencies'
-    condition: ne(variables.CACHE_RESTORED, 'true')
+    env:
+      SKIP_PREPARE: 'true'
 
   - script: 'yarn build:development'
     displayName: 'Build Development'
diff --git a/.ci/azure-pipelines-lint.yml b/.ci/azure-pipelines-lint.yml
index 1e4bddbd04..8d9efbd73a 100644
--- a/.ci/azure-pipelines-lint.yml
+++ b/.ci/azure-pipelines-lint.yml
@@ -12,15 +12,15 @@ jobs:
       versionSpec: '12.x'
 
   - task: Cache@2
-    displayName: 'Check Cache'
+    displayName: 'Cache node_modules'
     inputs:
       key: 'yarn | yarn.lock'
       path: 'node_modules'
-      cacheHitVar: CACHE_RESTORED
 
   - script: 'yarn install --frozen-lockfile'
     displayName: 'Install Dependencies'
-    condition: ne(variables.CACHE_RESTORED, 'true')
+    env:
+      SKIP_PREPARE: 'true'
 
   - script: 'yarn run lint --quiet'
     displayName: 'Run ESLint'
diff --git a/package.json b/package.json
index bb1440bea2..c7da5adb11 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
   "scripts": {
     "start": "yarn serve",
     "serve": "webpack serve --config webpack.dev.js",
-    "prepare": "webpack --config webpack.prod.js",
+    "prepare": "./scripts/prepare.sh",
     "build:development": "webpack --config webpack.dev.js",
     "build:production": "webpack --config webpack.prod.js",
     "lint": "eslint \".\"",
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
new file mode 100755
index 0000000000..bde12b36a5
--- /dev/null
+++ b/scripts/prepare.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+if [ -z "${SKIP_PREPARE}" ]; then
+    webpack --config webpack.prod.js
+fi