diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
index 4fbb771280..efa57b01af 100644
--- a/.github/workflows/test_build.yml
+++ b/.github/workflows/test_build.yml
@@ -24,7 +24,8 @@ jobs:
         with:
           path: .git/
           key: test-build-cache-git-${{ github.run_id }}
-          restore-keys: test-build-cache-git
+          restore-keys: |
+            - test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
       - name: Detect changes
@@ -62,7 +63,8 @@ jobs:
         with:
           path: .git/
           key: test-build-cache-git-${{ github.run_id }}
-          restore-keys: test-build-cache-git
+          restore-keys: |
+            - test-build-cache-git
   linux_build:
     needs: changes
     if: ${{ needs.changes.outputs.any == 'true' }}
@@ -74,7 +76,8 @@ jobs:
         with:
           path: .git/
           key: test-build-cache-git-${{ github.run_id }}
-          restore-keys: test-build-cache-git
+          restore-keys: |
+            - test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install OpenCL
@@ -98,7 +101,8 @@ jobs:
             - doc/_extra/
             - doc/development/api/python/
           key: ${{ runner.os }}-test-build-cache-tmp-files-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-test-build-cache-tmp-files
+          restore-keys: |
+            - ${{ runner.os }}-test-build-cache-tmp-files
       - name: Test C++ code
         if: ${{ needs.changes.outputs.cpp_tests == 'true' }}
         run: ./build tests_cpp
@@ -136,7 +140,8 @@ jobs:
             - doc/_extra/
             - doc/development/api/python/
           key: ${{ runner.os }}-test-build-cache-tmp-files-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-test-build-cache-tmp-files
+          restore-keys: |
+            - ${{ runner.os }}-test-build-cache-tmp-files
   macos_build:
     needs: changes
     if: ${{ needs.changes.outputs.cpp == 'true' }}
@@ -148,7 +153,8 @@ jobs:
         with:
           path: .git/
           key: test-build-cache-git-${{ github.run_id }}
-          restore-keys: test-build-cache-git
+          restore-keys: |
+            - test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install OpenMP
@@ -165,7 +171,8 @@ jobs:
             - scons/build/
             - cpp/build/
           key: ${{ runner.os }}-test-build-cache-tmp-files-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-test-build-cache-tmp-files
+          restore-keys: |
+            - ${{ runner.os }}-test-build-cache-tmp-files
       - name: Compile via Clang
         run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/usr/local/opt/opencl-clhpp-headers/include ./build compile
       - name: Save build files to cache
@@ -177,7 +184,8 @@ jobs:
             - scons/build/
             - cpp/build/
           key: ${{ runner.os }}-test-build-cache-tmp-files-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-test-build-cache-tmp-files
+          restore-keys: |
+            - ${{ runner.os }}-test-build-cache-tmp-files
   windows_build:
     needs: changes
     if: ${{ needs.changes.outputs.cpp == 'true' }}
@@ -190,7 +198,8 @@ jobs:
           enableCrossOsArchive: true
           path: .git/
           key: test-build-cache-git-${{ github.run_id }}
-          restore-keys: test-build-cache-git
+          restore-keys: |
+            - test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
       - name: Prepare MSVC
@@ -213,7 +222,8 @@ jobs:
             - scons/build/
             - cpp/build/
           key: ${{ runner.os }}-test-build-cache-tmp-files-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-test-build-cache-tmp-files
+          restore-keys: |
+            - ${{ runner.os }}-test-build-cache-tmp-files
       - name: Compile via MSVC
         run: |
           $env:TEST_SUPPORT = "disabled"
@@ -229,4 +239,5 @@ jobs:
             - scons/build/
             - cpp/build/
           key: ${{ runner.os }}-test-build-cache-tmp-files-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-test-build-cache-tmp-files
+          restore-keys: |
+            - ${{ runner.os }}-test-build-cache-tmp-files
diff --git a/.github/workflows/test_format.yml b/.github/workflows/test_format.yml
index 6e48d9f3fc..14dae01586 100644
--- a/.github/workflows/test_format.yml
+++ b/.github/workflows/test_format.yml
@@ -21,7 +21,8 @@ jobs:
         with:
           path: .git/
           key: test-format-cache-git-${{ github.run_id }}
-          restore-keys: test-format-cache-git
+          restore-keys: |
+            - test-format-cache-git
       - name: Checkout
         uses: actions/checkout@v4
       - name: Detect changes
@@ -51,7 +52,8 @@ jobs:
             - venv/
             - scons/build/
           key: test-format-cache-tmp-files-${{ github.run_id }}
-          restore-keys: test-format-cache-tmp-files
+          restore-keys: |
+            - test-format-cache-tmp-files
       - name: Check C++ code style
         if: steps.filter.outputs.cpp == 'true'
         run: ./build test_format_cpp
@@ -66,11 +68,13 @@ jobs:
             - venv/
             - scons/build/
           key: test-format-cache-tmp-files-${{ github.run_id }}
-          restore-keys: test-format-cache-tmp-files
+          restore-keys: |
+            - test-format-cache-tmp-files
       - name: Save Git repository to cache
         uses: actions/cache/save@v3
         if: success() || failure()
         with:
           path: .git/
           key: test-format-cache-git-${{ github.run_id }}
-          restore-keys: test-format-cache-git
+          restore-keys: |
+            - test-format-cache-git