diff --git a/circle.yml b/circle.yml
index 5e8f9e562..8901e4c00 100644
--- a/circle.yml
+++ b/circle.yml
@@ -15,4 +15,5 @@ dependencies:
 
 test:
   override:
-    - npm test && npm run docs-webpack-2-test && npm run docs-webpack-2-reset
+    - npm test && npm run docs-webpack-2-test # && npm run docs-webpack-2-reset
+    # no need to run "docs-webpack-2-reset" as circle ci cache is saved just after the initial npm install
diff --git a/package.json b/package.json
index 805928966..856ef87f5 100644
--- a/package.json
+++ b/package.json
@@ -161,10 +161,10 @@
     "test-setup": "cd test-setup && npm test",
     "docs": "babel-node scripts/docs.js",
     "docs-linting": "eslint --ignore-path .gitignore --fix docs/scripts docs/src",
-    "docs-webpack-2": "yarn add webpack@^2.1.0-beta.25 && babel-node scripts/docs.js && cd docs && yarn add extract-text-webpack-plugin@^2.0.0-beta.4",
-    "docs-webpack-2-reset": "yarn add webpack@^1.11.0 && babel-node scripts/docs.js && cd docs && yarn add extract-text-webpack-plugin@^1.0.1",
-    "docs-webpack-2-start": "npm run docs-webpack-2 && npm start",
+    "docs-webpack-2": "npm install webpack@^2.1.0-beta.25 && babel-node scripts/docs.js && cd docs && npm install extract-text-webpack-plugin@^2.0.0-beta.4",
+    "docs-webpack-2-reset": "npm install webpack@^1.11.0 && babel-node scripts/docs.js && cd docs && npm install extract-text-webpack-plugin@^1.0.1",
     "docs-webpack-2-test": "npm run docs-webpack-2 && cd docs && npm test",
+    "docs-webpack-2-start": "npm run docs-webpack-2 && npm start",
     "pretest-docs": "npm run docs && npm run docs-linting",
     "test-docs": "cd docs && npm test",
     "predocs-start": "npm run docs",