diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index befbc38117a81bbe2fa20b2f029cb7693c73b8f7..d430d9e756406f314fc5321cb12f152c6d7ab59d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,9 @@ upload:
 
 cache:
   untracked: true
+  paths:
+    - static/
+    - content/
 
 # Needs following env var: LFTP_PASSWORD
 
diff --git a/upload b/upload
index 3f62eef6a4c258acc4d7b1b90ca4302dba46b1d1..0178a176b3af95835053be997fcba147567e5ffb 100755
--- a/upload
+++ b/upload
@@ -8,8 +8,9 @@ fi
 rm -rf build
 mkdir -p build/theme
 time node index.js --noserver
-echo "Site compilation ended with status code $?"
-if [ $? -ne 0 ]
+RET=$?
+echo "Site compilation ended with status code $RET"
+if [ $RET -ne 0 ]
 then
     echo "Error detected. Exitting."
     exit 1
@@ -33,7 +34,8 @@ if [ "$1" == "ftp" ]; then
                   open --user $USER --env-password ftp://$HOST/;\
                   mirror -c --verbose=9 -e -R -L ./build /;\
                   exit 0;"
-    echo "LFTP finished with return code $?"
+    RET=$?
+    echo "LFTP finished with return code $RET"
 else
     echo "Using SFTP"
     time lftp -e "set sftp:auto-confirm yes;\
@@ -44,7 +46,8 @@ else
                   open --user $USER --env-password -p 2121 sftp://$HOST/;\
                   mirror -c --verbose=9 -e -R -L ./build /;\
                   exit 0;"
-    echo "LFTP finished with return code $?"
+    RET=$?
+    echo "LFTP finished with return code $RET"
 fi
-exit 0
+exit $RET