diff --git a/.github/actions/prepare-protobuf-cache/action.yml b/.github/actions/prepare-protobuf-cache/action.yml
index 704f156..734c019 100644
--- a/.github/actions/prepare-protobuf-cache/action.yml
+++ b/.github/actions/prepare-protobuf-cache/action.yml
@@ -18,8 +18,18 @@ runs:
       with:
         path: |
           /usr/local/lib/libproto*
+          /usr/local/lib/libabsl*
+          /usr/local/lib/libutf8*
+          /usr/local/lib/cmake/protobuf
+          /usr/local/lib/cmake/absl
+          /usr/local/lib/cmake/utf8_range
           /usr/local/include/google/protobuf
-        key: protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}
+          /usr/local/include/absl
+          /usr/local/include/utf8_range.h
+          /usr/local/bin/protoc*
+        key: protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}-v2
+        restore-keys: |
+          protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}-v2
 
     - name: Install Protobuf
       if: steps.restore-protobuf-cache.outputs.cache-hit != 'true'
@@ -28,6 +38,7 @@ runs:
         git clone --depth 1 --branch ${{ inputs.protobuf-ref }} https://github.com/protocolbuffers/protobuf protobuf
         cmake -S protobuf -B protobuf/build -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
+          -Dprotobuf_BUILD_TESTS=OFF \
           -DCMAKE_EXE_LINKER_FLAGS="${{ inputs.mold-linker-flags }}" \
           -DCMAKE_SHARED_LINKER_FLAGS="${{ inputs.mold-linker-flags }}" \
           -DCMAKE_MODULE_LINKER_FLAGS="${{ inputs.mold-linker-flags }}"
@@ -41,5 +52,13 @@ runs:
       with:
         path: |
           /usr/local/lib/libproto*
+          /usr/local/lib/libabsl*
+          /usr/local/lib/libutf8*
+          /usr/local/lib/cmake/protobuf
+          /usr/local/lib/cmake/absl
+          /usr/local/lib/cmake/utf8_range
           /usr/local/include/google/protobuf
-        key: protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}
+          /usr/local/include/absl
+          /usr/local/include/utf8_range.h
+          /usr/local/bin/protoc*
+        key: protobuf-${{ runner.os }}-${{ inputs.protobuf-ref }}-v2