diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index ebc03b771cee6..6e3d8ee9360cd 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -166,7 +166,6 @@ jobs:
           bazelrc: common --color=yes
           # Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
           output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
-          cache-version: 2
           disk-cache: false
           external-cache: |
             manifest:
diff --git a/.github/workflows/gh-cache.yml b/.github/workflows/gh-cache.yml
index 711b5574802d1..0ff5c13b65cd0 100644
--- a/.github/workflows/gh-cache.yml
+++ b/.github/workflows/gh-cache.yml
@@ -1,10 +1,23 @@
-name: CI Cache
+name: GitHub Cache
 
 on:
+  push:
+    branches: [trunk]
+    paths:
+      - 'MODULE.bazel'
+      - 'rust/Cargo.lock'
+      - 'java/maven_install.json'
+      - 'py/requirements_lock.txt'
+      - 'rb/Gemfile.lock'
+      - 'dotnet/paket.lock'
+      - 'common/repositories.bzl'
+      - 'common/browsers.bzl'
+  schedule:
+    - cron: '30 6 * * *'
   workflow_dispatch:
 
 concurrency:
-  group: ci-cache-${{ github.ref }}
+  group: gh-cache-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -21,9 +34,8 @@ jobs:
     with:
       name: ${{ matrix.os }}
       os: ${{ matrix.os }}
-      cache-save: false
-      run: >
-        bazel build --nobuild --build_tests_only --keep_going
-        --repo_contents_cache=
-        //java/... //py/... //rb/... //rust/...
-        //javascript/selenium-webdriver/... //dotnet/...
+      cache-save: true
+      run: >-
+        bazel build --nobuild --build_tests_only --keep_going --repo_contents_cache=
+        //java/test/... //py:* //rb/spec/... //rust/tests/...
+        //javascript/selenium-webdriver:* //dotnet/test/...