diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6f1ac78ae..c90d73623 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,8 +48,9 @@ jobs:
             21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }}
 
       - name: Verify Maven Central credential transport
@@ -107,8 +108,9 @@ jobs:
             21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }}
 
       - name: Build SDK
@@ -156,8 +158,9 @@ jobs:
             21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }}
 
       - name: Restore exact-run Gradle build cache
@@ -194,8 +197,9 @@ jobs:
             21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }}
 
       - name: Restore exact-run Gradle build cache
@@ -240,8 +244,9 @@ jobs:
             21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: true
 
       - name: Restore exact-run Gradle build cache
@@ -296,8 +301,9 @@ jobs:
           java-version: 21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }}
 
       - name: Read version support policy
@@ -341,8 +347,9 @@ jobs:
           java-version: 21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-read-only: true
 
       - name: Restore exact-run Gradle build cache
diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml
index 7e43dd8c3..8c2a03196 100644
--- a/.github/workflows/create-releases.yml
+++ b/.github/workflows/create-releases.yml
@@ -290,8 +290,9 @@ jobs:
           printf 'GRADLE_USER_HOME=%s\n' "$TRUSTED_GRADLE_USER_HOME" >> "$GITHUB_ENV"
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-disabled: true
 
       - name: Compile the openai-java-core project
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index a0e74dbc8..b1ed0e816 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -36,7 +36,9 @@ jobs:
             21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        with:
+          cache-provider: basic
 
       - name: Run example
         env:
diff --git a/.github/workflows/runtime-compatibility.yml b/.github/workflows/runtime-compatibility.yml
index 56faa3596..98e09de5d 100644
--- a/.github/workflows/runtime-compatibility.yml
+++ b/.github/workflows/runtime-compatibility.yml
@@ -43,7 +43,9 @@ jobs:
           java-version: 21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        with:
+          cache-provider: basic
 
       - name: Read version support policy
         id: matrix
@@ -81,7 +83,9 @@ jobs:
           java-version: 21
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        with:
+          cache-provider: basic
 
       - name: Run consumer compatibility smoke test
         env:
diff --git a/.github/workflows/x509-live-smoke.yml b/.github/workflows/x509-live-smoke.yml
index fc749561c..9bed96f97 100644
--- a/.github/workflows/x509-live-smoke.yml
+++ b/.github/workflows/x509-live-smoke.yml
@@ -89,8 +89,9 @@ jobs:
           printf 'GRADLE_USER_HOME=%s\n' "$TRUSTED_GRADLE_USER_HOME" >> "$GITHUB_ENV"
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
         with:
+          cache-provider: basic
           cache-disabled: true
 
       - name: Verify enrolled X.509 identity
diff --git a/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt b/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt
index c61b4f30d..c348aa754 100644
--- a/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt
+++ b/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt
@@ -796,8 +796,8 @@ class GradleCacheTrustPolicyTest {
                 ),
                 workflow.replaceFirst(javaSetup, "          cache: gradle\n$javaSetup"),
                 workflow.replaceFirst(
-                    "gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c",
-                    "gradle/actions/setup-gradle@v5",
+                    Regex("gradle/actions/setup-gradle@[0-9a-fA-F]{40}"),
+                    "gradle/actions/setup-gradle@v6",
                 ),
             )
             .forEach { poisonedWorkflow ->
@@ -885,7 +885,7 @@ class GradleCacheTrustPolicyTest {
             mapOf(
                 "actions/checkout" to setOf("persist-credentials", "ref"),
                 "actions/setup-java" to setOf("distribution", "java-version"),
-                "gradle/actions/setup-gradle" to setOf("cache-disabled"),
+                "gradle/actions/setup-gradle" to setOf("cache-disabled", "cache-provider"),
                 "graalvm/setup-graalvm" to setOf("distribution", "java-version"),
                 "actions/attest" to setOf("subject-path", "predicate-type", "predicate-path"),
             )