diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index b6c08fc38..ac2ba7ebd 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -34,29 +34,27 @@ jobs:
           ./install_ndk.sh
           source ./app_env.sh cakewallet
           ./app_config.sh
+
+      - name: Cache Externals
+        id: cache-externals
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/android/cake_wallet/cw_haven/android/.cxx
+            /opt/android/cake_wallet/cw_haven/ios/External
+            /opt/android/cake_wallet/cw_monero/android/.cxx
+            /opt/android/cake_wallet/cw_monero/ios/External
+            /opt/android/cake_wallet/cw_shared_external/ios/External
+          key: ${{ hashFiles('**/build_monero.sh', '**/build_haven.sh') }}
+
+      - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
+        name: Generate Externals
+        run: |
+          cd /opt/android/cake_wallet/scripts/android/
+          source ./app_env.sh cakewallet
           ./build_all.sh
           ./copy_monero_deps.sh
 
-#      - name: Cache Externals
-#        id: cache-externals
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            /opt/android/cake_wallet/cw_haven/android/.cxx
-#            /opt/android/cake_wallet/cw_haven/ios/External
-#            /opt/android/cake_wallet/cw_monero/android/.cxx
-#            /opt/android/cake_wallet/cw_monero/ios/External
-#            /opt/android/cake_wallet/cw_shared_external/ios/External
-#          key: ${{ hashFiles('**/build_monero.sh', '**/build_haven.sh') }}
-#
-#      - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
-#        name: Generate Externals
-#        run: |
-#          cd /opt/android/cake_wallet/scripts/android/
-#          source ./app_env.sh cakewallet
-#          ./build_all.sh
-#          ./copy_monero_deps.sh
-
       - name: Install Flutter dependencies
         run: |
           cd /opt/android/cake_wallet