diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml
index 70584d0..e3923c7 100644
--- a/.gitea/workflows/gentoo-utils.yml
+++ b/.gitea/workflows/gentoo-utils.yml
@@ -16,13 +16,13 @@ jobs:
     continue-on-error: true
     steps:
       - name: Restore git cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .git
           key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
 
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -91,20 +91,28 @@ jobs:
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-      - name: Restore git cache
-        uses: actions/cache@v4
+      - name: Restore Git Cache
+        uses: actions/cache/restore@v5
         with:
-          path: build
+          path: .git
           key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
 
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: build and check
+      - name: Build
         run: |
           meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
           meson compile -C build
 
+      - name: Cache Build + Subprojects
+        uses: actions/cache@v5
+        with:
+          path: |
+            subprojects
+            build
+          key: build-${{ gitea.repository }}-${{ gitea.sha }}
+
   # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
   # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
   test:
@@ -116,13 +124,23 @@ jobs:
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
+
       - name: Restore git cache
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v5
         with:
-          path: build
+          path: .git
           key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
+
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
+
+      - name: Restore build cache
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            subprojects
+            build
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
 
       - name: test
         run: |
@@ -140,14 +158,22 @@ jobs:
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-      - name: Restore git cache
-        uses: actions/cache@v4
+      - name: Restore Git Cache
+        uses: actions/cache/restore@v5
         with:
-          path: build
+          path: .git
           key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
-      - name: Checkout repo
-        uses: actions/checkout@v5
 
+      - name: Checkout repo
+        uses: actions/checkout@v6
+
+      - name: Restore Build Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            subprojects
+            build
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
       # FIXME: Get rid of this step when portage has fixes merged?
       # needed because portage has fixes upstream we need that arent stable yet
       - name: Checkout tip of portage
@@ -169,12 +195,26 @@ jobs:
 
   check-format:
     runs-on: gentoo
-    needs: [build-oci-image]
+    needs: [build-oci-image, build]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
+      - name: Restore Git Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: .git
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
+
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
+
+      - name: Restore Build Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            subprojects
+            build
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
 
       - name: Check Formatting
         run: |
@@ -184,12 +224,26 @@ jobs:
 
   docs:
     runs-on: gentoo
-    needs: [build-oci-image]
+    needs: [build-oci-image, build]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
+      - name: Restore Git Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: .git
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
+
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
+
+      - name: Restore Build Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            subprojects
+            build
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
 
       - name: Build Documentation
         run: |
@@ -202,8 +256,14 @@ jobs:
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
+      - name: Restore Git Cache
+        uses: actions/cache/restore@v5
+        with:
+          path: .git
+          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
+
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: grep for patterns
         # negate git grep ret code because 1 means no findings