diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 55b620393c22c746abd32b0bbf70029f30f02afc..fbf55830d6aa97b9dace339b48a1a7490dc9e883 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -12,7 +12,7 @@ runs:
       id: cache
       with:
         path: '**/node_modules'
-        key: yarn-v1-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+        key: yarn-v1-${{ runner.os }}-${{ hashFiles('.nvmrc') }}-${{ hashFiles('**/yarn.lock') }}
     - name: Install
       run: yarn --immutable
       shell: bash
diff --git a/upcoming-release-notes/1118.md b/upcoming-release-notes/1118.md
new file mode 100644
index 0000000000000000000000000000000000000000..e27c1ee0b5d408cfbdafd3c8ec1d95633980bfd9
--- /dev/null
+++ b/upcoming-release-notes/1118.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [j-f1]
+---
+
+Partition GitHub Actions cache based on Node version