diff --git a/.github/workflows/failure-cases.yml b/.github/workflows/failure-cases.yml
index 038d2b0..a1a53c5 100644
--- a/.github/workflows/failure-cases.yml
+++ b/.github/workflows/failure-cases.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 jobs:
 
diff --git a/.github/workflows/integTest-action-inputs.yml b/.github/workflows/integTest-action-inputs.yml
index 8d197de..3f8f7f1 100644
--- a/.github/workflows/integTest-action-inputs.yml
+++ b/.github/workflows/integTest-action-inputs.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 jobs:
   action-inputs:
diff --git a/.github/workflows/integTest-caching-config.yml b/.github/workflows/integTest-caching-config.yml
index 7b521aa..2557081 100644
--- a/.github/workflows/integTest-caching-config.yml
+++ b/.github/workflows/integTest-caching-config.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 
 jobs:
diff --git a/.github/workflows/integTest-caching-configuration-cache.yml b/.github/workflows/integTest-caching-configuration-cache.yml
index ad65c03..6126708 100644
--- a/.github/workflows/integTest-caching-configuration-cache.yml
+++ b/.github/workflows/integTest-caching-configuration-cache.yml
@@ -14,7 +14,7 @@ jobs:
   # These builds should start fresh without cache hits, due to the seed injected into the cache key above.
   seed-build-groovy:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-groovy-
+      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
@@ -30,7 +30,7 @@ jobs:
 
   configuration-cache-groovy:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-groovy-
+      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
     needs: seed-build-groovy
     strategy:
       matrix:
@@ -52,7 +52,7 @@ jobs:
   # Check that the build can run when no extracted cache entries are restored
   no-extracted-cache-entries-restored:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-groovy-
+      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
     needs: seed-build-groovy
     strategy:
       matrix:
@@ -73,7 +73,7 @@ jobs:
 
   seed-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-kotlin-
+      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
@@ -89,7 +89,7 @@ jobs:
 
   modify-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-kotlin-
+      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
     needs: seed-build-kotlin
     strategy:
       matrix:
@@ -107,7 +107,7 @@ jobs:
  # Test restore configuration-cache from the third build invocation
   configuration-cache-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-kotlin-
+      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
     needs: modify-build-kotlin
     strategy:
       matrix:
diff --git a/.github/workflows/integTest-caching-gradle-home.yml b/.github/workflows/integTest-caching-gradle-home.yml
index 0e0656e..79f089d 100644
--- a/.github/workflows/integTest-caching-gradle-home.yml
+++ b/.github/workflows/integTest-caching-gradle-home.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 jobs:
   seed-build:
diff --git a/.github/workflows/integTest-caching-java-toolchain.yml b/.github/workflows/integTest-caching-java-toolchain.yml
index 05288fd..aded20c 100644
--- a/.github/workflows/integTest-caching-java-toolchain.yml
+++ b/.github/workflows/integTest-caching-java-toolchain.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 jobs:
   seed-build:
diff --git a/.github/workflows/integTest-execution-with-caching.yml b/.github/workflows/integTest-execution-with-caching.yml
index 1b80861..0c1dd83 100644
--- a/.github/workflows/integTest-execution-with-caching.yml
+++ b/.github/workflows/integTest-execution-with-caching.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 jobs:
   seed-build:
diff --git a/.github/workflows/integTest-execution.yml b/.github/workflows/integTest-execution.yml
index a939d20..38dbdac 100644
--- a/.github/workflows/integTest-execution.yml
+++ b/.github/workflows/integTest-execution.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 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 47cd34f..8623bf3 100644
--- a/.github/workflows/integTest-gradle-user-home.yml
+++ b/.github/workflows/integTest-gradle-user-home.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
   GRADLE_USER_HOME: ${{github.workspace}}/custom/gradle/home
 
 jobs:
diff --git a/.github/workflows/integTest-gradle-versions.yml b/.github/workflows/integTest-gradle-versions.yml
index 628b554..1c7b3f2 100644
--- a/.github/workflows/integTest-gradle-versions.yml
+++ b/.github/workflows/integTest-gradle-versions.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 
 jobs:   
   # Tests for executing with different Gradle versions. 
diff --git a/.github/workflows/integTest-sample-gradle-plugin.yml b/.github/workflows/integTest-sample-gradle-plugin.yml
index 148ac12..69e5ce2 100644
--- a/.github/workflows/integTest-sample-gradle-plugin.yml
+++ b/.github/workflows/integTest-sample-gradle-plugin.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 
 jobs:
diff --git a/.github/workflows/integTest-sample-kotlin-dsl.yml b/.github/workflows/integTest-sample-kotlin-dsl.yml
index c9b7655..cfe3f23 100644
--- a/.github/workflows/integTest-sample-kotlin-dsl.yml
+++ b/.github/workflows/integTest-sample-kotlin-dsl.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 
 jobs: