diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml
index 576a61a96..fb092e8e6 100644
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -95,21 +95,35 @@ jobs:
           fetch-depth: 1
 
       - uses: actions/cache@v4
-        id: cache-3party
         with:
-          path: "3party"
-          key: 3party-cache-${{ steps.date.outputs.date }}
+          path: |
+            3party/CMake-MetalShaderSupport
+            3party/Vulkan-Headers
+            3party/boost
+            3party/expat
+            3party/fast_double_parser
+            3party/fast_obj
+            3party/freetype/freetype
+            3party/gflags
+            3party/glaze
+            3party/glfw
+            3party/glm
+            3party/googletest
+            3party/harfbuzz/harfbuzz
+            3party/icu/icu
+            3party/imgui/imgui
+            3party/jansson/jansson
+            3party/just_gtfs
+            3party/protobuf/protobuf
+            3party/pugixml/pugixml
+            3party/utfcpp
+            tools/kothic
+            tools/osmctools
+          key: submodules-cache-${{ steps.date.outputs.date }}
 
       - name: Parallel submodules checkout
         shell: bash
-        run: |
-          if [ "${{ steps.cache-3party.outputs.cache-hit }}" == "true" ]; then
-            echo "Cache hit, syncing submodules"
-            git submodule sync --recursive
-          else
-            echo "No cache, checking out submodules"
-            git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
-          fi
+        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Lint
         shell: bash
@@ -191,21 +205,35 @@ jobs:
           fetch-depth: 200 # enough to get all commits for the current day
 
       - uses: actions/cache@v4
-        id: cache-3party
         with:
-          path: "3party"
-          key: 3party-cache-${{ steps.date.outputs.date }}
+          path: |
+            3party/CMake-MetalShaderSupport
+            3party/Vulkan-Headers
+            3party/boost
+            3party/expat
+            3party/fast_double_parser
+            3party/fast_obj
+            3party/freetype/freetype
+            3party/gflags
+            3party/glaze
+            3party/glfw
+            3party/glm
+            3party/googletest
+            3party/harfbuzz/harfbuzz
+            3party/icu/icu
+            3party/imgui/imgui
+            3party/jansson/jansson
+            3party/just_gtfs
+            3party/protobuf/protobuf
+            3party/pugixml/pugixml
+            3party/utfcpp
+            tools/kothic
+            tools/osmctools
+          key: submodules-cache-${{ steps.date.outputs.date }}
 
       - name: Parallel submodules checkout
         shell: bash
-        run: |
-          if [ "${{ steps.cache-3party.outputs.cache-hit }}" == "true" ]; then
-            echo "Cache hit, syncing submodules"
-            git submodule sync --recursive
-          else
-            echo "No cache, checking out submodules"
-            git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
-          fi
+        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Configure ccache
         uses: https://github.com/hendrikmuhs/ccache-action@v1.2