diff --git a/Dockerfile b/Dockerfile
index a558b7b8b..b8eee3a62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,9 @@
 # limitations under the License.
 #
 
+######################################################################
+# PY stage that simply does a pip install on our requirements
+######################################################################
 ARG PY_VER=3.6.9
 FROM python:${PY_VER} AS superset-py
 
@@ -26,26 +29,37 @@ RUN mkdir /app \
             libpq-dev \
         && rm -rf /var/lib/apt/lists/*
 
-COPY ./requirements.txt ./docker/requirements-extra.txt ./setup.py ./MANIFEST.in ./README.md ./app/
-COPY superset /app/superset
-
+# First, we just wanna install requirements, which will allow us to utilize the cache
+# in order to only build if and only if requirements change
+COPY ./requirements.txt /app/
 RUN cd /app \
-        && pip install -r requirements.txt -r requirements-extra.txt \
-        && pip install -e .
+        && pip install --no-cache -r requirements.txt
 
 
+######################################################################
+# Node stage to deal with static asset construction
+######################################################################
 FROM node:10-jessie AS superset-node
 
-COPY ./superset/assets /app/superset/assets
-
+# NPM ci first, as to NOT invalidate previous steps except for when package.json changes
+RUN mkdir -p /app/superset/assets
+COPY ./superset/assets/package* /app/superset/assets/
+RUN cd /app/superset/assets \
+        && npm ci
+
+# Next, copy in the rest and let webpack do its thing
+COPY ./superset/assets /app/superset/assets
+# This is BY FAR the most expensive step (thanks Terser!)
 RUN cd /app/superset/assets \
-        && npm ci \
         && npm run build \
         && rm -rf node_modules
 
+
+######################################################################
 # Final lean image...
+######################################################################
 ARG PY_VER=3.6.9
-FROM python:${PY_VER}
+FROM python:${PY_VER} AS lean
 
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8 \
@@ -57,7 +71,6 @@ ENV LANG=C.UTF-8 \
 
 RUN useradd --user-group --no-create-home --no-log-init --shell /bin/bash superset \
         && mkdir -p ${SUPERSET_HOME} ${PYTHONPATH} \
-        && chown -R superset:superset /app \
         && apt-get update -y \
         && apt-get install -y --no-install-recommends \
             build-essential \
@@ -65,14 +78,18 @@ RUN useradd --user-group --no-create-home --no-log-init --shell /bin/bash supers
             libpq-dev \
         && rm -rf /var/lib/apt/lists/*
 
-COPY --from=superset-py --chown=superset:superset /app/superset /app/superset
 COPY --from=superset-py /usr/local/lib/python3.6/site-packages/ /usr/local/lib/python3.6/site-packages/
 # Copying site-packages doesn't move the CLIs, so let's copy them one by one
-COPY --from=superset-py /usr/local/bin/superset /usr/local/bin/gunicorn /usr/local/bin/celery /usr/local/bin/flask /usr/bin/
-COPY --from=superset-py /app/apache_superset.egg-info /app/apache_superset.egg-info
-
+COPY --from=superset-py /usr/local/bin/gunicorn /usr/local/bin/celery /usr/local/bin/flask /usr/bin/
 COPY --from=superset-node /app/superset/assets /app/superset/assets
 
+## Lastly, let's install superset itself
+COPY superset /app/superset
+COPY setup.py MANIFEST.in README.md /app/
+RUN cd /app \
+        && chown -R superset:superset * \
+        && pip install -e .
+
 COPY ./docker/docker-entrypoint.sh /usr/bin/
 
 WORKDIR /app
@@ -84,3 +101,15 @@ HEALTHCHECK CMD ["curl", "-f", "http://localhost:8088/health"]
 EXPOSE ${SUPERSET_PORT}
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
+
+######################################################################
+# Dev image...
+######################################################################
+FROM lean AS dev
+
+COPY ./requirements-dev.txt ./docker/requirements-extra.txt /app/
+
+USER root
+RUN cd /app \
+    && pip install --no-cache -r requirements-dev.txt -r requirements-extra.txt
+USER superset
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index ed73d4ea8..85a473cef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@
 x-superset-build: &superset-build
   context: ./
   dockerfile: Dockerfile
+  target: dev
 x-superset-depends-on: &superset-depends-on
   - postgres
   - redis
@@ -25,6 +26,7 @@ x-superset-volumes: &superset-volumes
   - ./docker/docker-init.sh:/app/docker-init.sh
   - ./docker/pythonpath_dev:/app/pythonpath
   - ./superset:/app/superset
+  - superset_home:/app/superset_home
 
 version: "3.7"
 services:
@@ -78,6 +80,8 @@ services:
     volumes: *superset-volumes
 
 volumes:
+  superset_home:
+    external: false
   postgres:
     external: false
   redis:
diff --git a/docker/docker-init.sh b/docker/docker-init.sh
index 2e3c490f9..b2a6d3992 100755
--- a/docker/docker-init.sh
+++ b/docker/docker-init.sh
@@ -15,26 +15,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-set -ex
+set -e
+
+STEP_CNT=4
+
+echo_step() {
+cat <<EOF
+
+######################################################################
+
+
+Init Step ${1}/${STEP_CNT} [${2}] -- ${3}
+
+
+######################################################################
+
+EOF
+}
 
 # Create an admin user
-echo "Setting up admin user..."
+echo_step "1" "Starting" "Setting up admin user"
 flask fab create-admin \
               --username admin \
               --firstname Superset \
               --lastname Admin \
               --email admin@superset.com \
               --password admin
+echo_step "1" "Complete" "Setting up admin user"
 
 # Initialize the database
-echo "Migrating the DB..."
+echo_step "2" "Starting" "Applying DB migrations"
 superset db upgrade
+echo_step "2" "Complete" "Applying DB migrations"
 
 if [ "$SUPERSET_LOAD_EXAMPLES" = "yes" ]; then
     # Load some data to play with
+    echo_step "3" "Starting" "Loading examples"
     superset load_examples
+    echo_step "3" "Complete" "Loading examples"
 fi
 
 # Create default roles and permissions
-echo "Setting up roles and perms..."
+echo_step "4" "Starting" "Setting up roles and perms"
 superset init
+echo_step "4" "Complete" "Setting up roles and perms"
diff --git a/docker/pythonpath_dev/superset_config.py b/docker/pythonpath_dev/superset_config.py
index 43e1838fe..8a1b7c591 100644
--- a/docker/pythonpath_dev/superset_config.py
+++ b/docker/pythonpath_dev/superset_config.py
@@ -25,6 +25,8 @@
 import logging
 import os
 
+from werkzeug.contrib.cache import FileSystemCache
+
 
 logger = logging.getLogger()
 
@@ -61,6 +63,8 @@ SQLALCHEMY_DATABASE_URI = "postgresql://%s:%s@%s:%s/%s" % (
 REDIS_HOST = get_env_variable("REDIS_HOST")
 REDIS_PORT = get_env_variable("REDIS_PORT")
 
+RESULTS_BACKEND = FileSystemCache('/app/superset_home/sqllab')
+
 
 class CeleryConfig(object):
     BROKER_URL = "redis://%s:%s/0" % (REDIS_HOST, REDIS_PORT)