diff --git a/HISTORY.md b/HISTORY.md
index 05dfa032c..5bf190958 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,7 @@
 
 ## 0.2.0 (in progress)
 
+* Cache dir is preserved across builds
 * Application config (environment variable management)
 * Basic hooks/plugin system
 * Exposed commands over SSH using sshcommand
@@ -17,4 +18,4 @@
    * Bootstrap script for Ubuntu system
    * Basic push / deploy with git
    * Hostname support with Nginx
-   * Support for Java, Ruby, Node.js buildpacks
\ No newline at end of file
+   * Support for Java, Ruby, Node.js buildpacks
diff --git a/dokku b/dokku
index 8b353b1b3..623b3e89d 100755
--- a/dokku
+++ b/dokku
@@ -23,12 +23,13 @@ case "$1" in
     ;;
 
   build)
-    APP="$2"; IMAGE="$3"
+    APP="$2"; IMAGE="$3"; CACHE_DIR="$HOME/$APP/cache"
     id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app")
     test $(docker wait $id) -eq 0
     docker commit $id $IMAGE > /dev/null
+    [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
     pluginhook pre-build $APP $IMAGE
-    id=$(docker run -d $IMAGE /build/builder)
+    id=$(docker run -d -v $CACHE_DIR:/cache $IMAGE /build/builder)
     docker attach $id
     test $(docker wait $id) -eq 0
     docker commit $id $IMAGE > /dev/null