diff --git a/Dockerfile b/Dockerfile
index 7baa35eab..4d031d74c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN pip install -r requirements_all_ds.txt && \
 RUN curl https://deb.nodesource.com/setup_4.x | bash - && \
   apt-get install -y nodejs && \
   sudo -u redash -H make deps && \
-  rm -rf rd_ui/node_modules /home/redash/.npm /home/redash/.cache && \
+  rm -rf node_modules rd_ui/node_modules /home/redash/.npm /home/redash/.cache && \
   apt-get purge -y nodejs && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
diff --git a/circle.yml b/circle.yml
index e93e92d05..d76615806 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,6 +14,7 @@ dependencies:
     - pip install pymongo==3.2.1
     - if [ "$CIRCLE_BRANCH" = "master" ]; then make deps; fi
   cache_directories:
+    - node_modules/
     - rd_ui/node_modules/
     - rd_ui/app/bower_components/
 test: