diff --git a/.github/workflows/smoke-test-restore-gradle-home.yml b/.github/workflows/integ-test-restore-gradle-home.yml
similarity index 84%
rename from .github/workflows/smoke-test-restore-gradle-home.yml
rename to .github/workflows/integ-test-restore-gradle-home.yml
index 1f097199..f739a4f5 100644
--- a/.github/workflows/smoke-test-restore-gradle-home.yml
+++ b/.github/workflows/integ-test-restore-gradle-home.yml
@@ -43,29 +43,6 @@ jobs:
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew test
 
-  # Test that the gradle-user-home cache will cache dependencies, by running build with --offline
-  restore-gradle-home-dependencies-cache:
-    needs: restore-gradle-home-seed-build
-    strategy:
-      max-parallel: 1
-      fail-fast: false
-      matrix:
-        os: ${{fromJSON(inputs.runner-os)}}
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Setup Gradle
-      uses: ./setup-gradle
-      with:
-        cache-read-only: true
-    - name: Execute Gradle build with --offline
-      working-directory: .github/workflow-samples/groovy-dsl
-      run: ./gradlew test --offline
-
   # Test that the gradle-user-home cache will cache and restore local build-cache
   restore-gradle-home-build-cache:
     needs: restore-gradle-home-seed-build
diff --git a/.github/workflows/smoke-test-basic-cache-provider.yml b/.github/workflows/smoke-test-basic-caching.yml
similarity index 94%
rename from .github/workflows/smoke-test-basic-cache-provider.yml
rename to .github/workflows/smoke-test-basic-caching.yml
index c31284b2..39a134df 100644
--- a/.github/workflows/smoke-test-basic-cache-provider.yml
+++ b/.github/workflows/smoke-test-basic-caching.yml
@@ -1,4 +1,4 @@
-name: Test basic cache provider
+name: Smoke test basic caching
 
 on:
   workflow_call:
@@ -15,7 +15,7 @@ on:
 
 env:
   SKIP_DIST: ${{ inputs.skip-dist }}
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: basic-cache-provider-${{ inputs.cache-key-prefix }}
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: smoke-test-basic-caching-${{ inputs.cache-key-prefix }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/smoke-test-enhanced-caching.yml b/.github/workflows/smoke-test-enhanced-caching.yml
new file mode 100644
index 00000000..2c9e2182
--- /dev/null
+++ b/.github/workflows/smoke-test-enhanced-caching.yml
@@ -0,0 +1,67 @@
+name: Smoke test enhanced caching
+
+on:
+  workflow_call:
+    inputs:
+      cache-key-prefix:
+        type: string
+        default: '0'
+      runner-os:
+        type: string
+        default: '["ubuntu-latest"]'
+      skip-dist:
+        type: boolean
+        default: false
+
+env:
+  SKIP_DIST: ${{ inputs.skip-dist }}
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: smoke-test-enhanced-caching-${{ inputs.cache-key-prefix }}
+  GRADLE_BUILD_ACTION_CACHE_KEY_JOB: smoke-test-enhanced-caching
+
+permissions:
+  contents: read
+
+jobs:
+  enhanced-cache-seed-build:
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Setup Gradle
+      uses: ./setup-gradle
+      with:
+        cache-read-only: false # For testing, allow writing cache entries on non-default branches
+    - name: Build using Gradle wrapper
+      working-directory: .github/workflow-samples/groovy-dsl
+      run: ./gradlew test
+
+  # Test that the gradle-user-home cache will cache dependencies, by running build with --offline
+  enhanced-cache-verify-build:
+    needs: enhanced-cache-seed-build
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Setup Gradle
+      uses: ./setup-gradle
+      with:
+        cache-read-only: true
+    - name: Execute Gradle build with --offline
+      working-directory: .github/workflow-samples/groovy-dsl
+      run: ./gradlew test --offline
diff --git a/.github/workflows/suite-integ-test-caching.yml b/.github/workflows/suite-integ-test-caching.yml
index eb73d27d..86f35404 100644
--- a/.github/workflows/suite-integ-test-caching.yml
+++ b/.github/workflows/suite-integ-test-caching.yml
@@ -36,6 +36,11 @@ jobs:
     with:
       skip-dist: ${{ inputs.skip-dist }}
 
+  restore-gradle-home:
+    uses: ./.github/workflows/integ-test-restore-gradle-home.yml
+    with:
+      skip-dist: ${{ inputs.skip-dist }}
+
   restore-java-toolchain:
     uses: ./.github/workflows/integ-test-restore-java-toolchain.yml
     with:
diff --git a/.github/workflows/suite-smoke-test-caching.yml b/.github/workflows/suite-smoke-test-caching.yml
index 4579c8b4..a98eda70 100644
--- a/.github/workflows/suite-smoke-test-caching.yml
+++ b/.github/workflows/suite-smoke-test-caching.yml
@@ -14,14 +14,14 @@ permissions:
   contents: read
 
 jobs:
-  restore-gradle-home:
-    uses: ./.github/workflows/smoke-test-restore-gradle-home.yml
+  enhanced-caching:
+    uses: ./.github/workflows/smoke-test-enhanced-caching.yml
     with:
       runner-os: '${{ inputs.runner-os }}'
       skip-dist: ${{ inputs.skip-dist }}
 
-  basic-cache-provider:
-    uses: ./.github/workflows/smoke-test-basic-cache-provider.yml
+  basic-caching:
+    uses: ./.github/workflows/smoke-test-basic-caching.yml
     with:
       runner-os: '${{ inputs.runner-os }}'
       skip-dist: ${{ inputs.skip-dist }}