diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e1546e..5982752 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,12 +62,15 @@ jobs:
       # Then start the emulator and run the Instrumentation tests!
       - android/start-emulator-and-run-tests:
           post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest
-          pull-data: true
-          pull-data-path: /storage
           test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest
           system-image: system-images;android-25;google_apis;x86
           run-logcat: true
           max-tries: 1
+          post-run-tests-steps:
+            - android/save-build-cache
+          pull-data: true
+          pull-data-path: storage
+          pull-data-target: "."
       # store test reports
       - store_artifacts:
           path: app/build/reports/androidTests/connected