diff --git a/ghost/admin/ember-cli-build.js b/ghost/admin/ember-cli-build.js
index 4455adba64..cd31800556 100644
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@@ -214,6 +214,14 @@ module.exports = function (defaults) {
                         fs: false
                     }
                 },
+                ...(isDevelopment && {
+                    cache: {
+                        type: 'filesystem',
+                        buildDependencies: {
+                            config: [__filename]
+                        }
+                    }
+                }),
                 plugins: [
                     new webpack.ProvidePlugin({
                         process: 'process/browser'
diff --git a/package.json b/package.json
index 1adca8371a..43ba1d97d8 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "dev:admin": "node .github/scripts/dev.js --admin",
     "dev:ghost": "node .github/scripts/dev.js --ghost",
     "dev": "node .github/scripts/dev.js",
-    "fix": "yarn cache clean && rm -rf node_modules && yarn",
+    "fix": "yarn cache clean && rimraf -g '**/node_modules' && yarn",
     "knex-migrator": "yarn workspace ghost run knex-migrator",
     "setup": "yarn && git submodule update --init && NODE_ENV=development node .github/scripts/setup.js",
     "reset:data": "cd ghost/core && node index.js generate-data --clear-database --quantities members:100,posts:1 --seed 123",