diff --git a/.github/workflows/failure-cases.yml b/.github/workflows/failure-cases.yml
index a3ebd06..038d2b0 100644
--- a/.github/workflows/failure-cases.yml
+++ b/.github/workflows/failure-cases.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 
 jobs:
 
diff --git a/.github/workflows/integTest-action-inputs.yml b/.github/workflows/integTest-action-inputs.yml
index bea6845..46489df 100644
--- a/.github/workflows/integTest-action-inputs.yml
+++ b/.github/workflows/integTest-action-inputs.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 
 jobs:
   action-inputs:
diff --git a/.github/workflows/integTest-caching-config.yml b/.github/workflows/integTest-caching-config.yml
index 7ffd2e4..cee52bc 100644
--- a/.github/workflows/integTest-caching-config.yml
+++ b/.github/workflows/integTest-caching-config.yml
@@ -6,8 +6,8 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
-  CACHE_DEBUG_ENABLED: true
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 
 jobs:
   # Run initial Gradle builds to push initial cache entries
@@ -27,11 +27,11 @@ jobs:
         arguments: test
         # Add "wrapper" to main cache entry and remove 'wrapper-zips' bundle
         # Exclude build-cache from main cache entry
-        cache-paths: |
+        gradle-home-cache-includes: |
             ["caches", "notifications", "wrapper"]
-        cache-exclude-paths: |
+        gradle-home-cache-excludes: |
             ["caches/build-cache-1"]
-        cache-artifact-bundles: |
+        gradle-home-cache-artifact-bundles: |
             [
               ["generated-gradle-jars", "caches/*/generated-gradle-jars/*.jar"],
               ["dependency-jars", "caches/modules-*/files-*/**/*.jar"],
@@ -56,11 +56,11 @@ jobs:
         arguments: test --offline
         cache-read-only: true
         # Need the same configuration when restoring state from cache
-        cache-paths: |
+        gradle-home-cache-includes: |
             ["caches", "notifications", "wrapper"]
-        cache-exclude-paths: |
+        gradle-home-cache-excludes: |
             ["caches/build-cache-1"]
-        cache-artifact-bundles: |
+        gradle-home-cache-artifact-bundles: |
             [
               ["generated-gradle-jars", "caches/*/generated-gradle-jars/*.jar"],
               ["dependency-jars", "caches/modules-*/files-*/**/*.jar"],
diff --git a/.github/workflows/integTest-caching.yml b/.github/workflows/integTest-caching.yml
index 2961566..2b9b5d8 100644
--- a/.github/workflows/integTest-caching.yml
+++ b/.github/workflows/integTest-caching.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 
 jobs:
   # Run initial Gradle builds to push initial cache entries
@@ -98,6 +98,6 @@ jobs:
       with:
         build-root-directory: __tests__/samples/groovy-dsl
         arguments: test
-        cache-artifact-bundles: '[]'
         cache-read-only: true
+        gradle-home-cache-artifact-bundles: '[]'
 
diff --git a/.github/workflows/integTest-execution.yml b/.github/workflows/integTest-execution.yml
index 2a9f824..d2cd3fa 100644
--- a/.github/workflows/integTest-execution.yml
+++ b/.github/workflows/integTest-execution.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 
 jobs:   
   # Tests for executing with different Gradle versions. 
diff --git a/.github/workflows/integTest-gradle-user-home.yml b/.github/workflows/integTest-gradle-user-home.yml
index 53543c7..d6a7e47 100644
--- a/.github/workflows/integTest-gradle-user-home.yml
+++ b/.github/workflows/integTest-gradle-user-home.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
   GRADLE_USER_HOME: custom/gradle/home
 
 jobs:
diff --git a/.github/workflows/integTest-kotlin-dsl.yml b/.github/workflows/integTest-kotlin-dsl.yml
index 863ba78..c0ce4ae 100644
--- a/.github/workflows/integTest-kotlin-dsl.yml
+++ b/.github/workflows/integTest-kotlin-dsl.yml
@@ -6,8 +6,8 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
-  CACHE_DEBUG_ENABLED: true
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 
 jobs:
   # Use kotlin-dsl project to verify caching of generated jars and compiled scripts