diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2dc7bf023..3b22f3166 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,11 +28,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Get PNPM version from package.json
-        id: pnpm-version
-        shell: sh
-        run: echo "pnpm_version=$(node -p 'require(`./package.json`).packageManager.split(\"@\")[1]')" >> $GITHUB_OUTPUT
-
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 72871db59..a93a33240 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -34,16 +34,19 @@ jobs:
         with:
           node-version-file: package.json
 
-      - name: Get PNPM version from package.json
-        id: pnpm-version
-        shell: bash
-        run: echo "pnpm_version=$(node -p 'require(`./package.json`).packageManager.split(\"@\")[1]')" >> $GITHUB_OUTPUT
-
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:
           version: ${{ steps.pnpm-version.outputs.pnpm_version }}
 
+      - name: Setup cypress cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/Cypress
+          key: ${{ runner.os }}-cypress-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-cypress-store-
+
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index e542bb6b3..573669188 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -31,11 +31,6 @@ jobs:
           node-version-file: package.json
           cache: 'pnpm'
 
-      - name: Get PNPM version from package.json
-        id: pnpm-version
-        shell: bash
-        run: echo "pnpm_version=$(node -p 'require(`./package.json`).packageManager.split(\"@\")[1]')" >> $GITHUB_OUTPUT
-
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dd06c2a87..1ebf5bced 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,11 +32,6 @@ jobs:
           node-version-file: package.json
           cache: 'pnpm'
 
-      - name: Get PNPM version from package.json
-        id: pnpm-version
-        shell: bash
-        run: echo "pnpm_version=$(node -p 'require(`./package.json`).packageManager.split(\"@\")[1]')" >> $GITHUB_OUTPUT
-
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:
diff --git a/.github/workflows/test-docs-deploy.yml b/.github/workflows/test-docs-deploy.yml
index e447e46c7..1d119323f 100644
--- a/.github/workflows/test-docs-deploy.yml
+++ b/.github/workflows/test-docs-deploy.yml
@@ -32,11 +32,6 @@ jobs:
         with:
           node-version-file: package.json
 
-      - name: Get PNPM version from package.json
-        id: pnpm-version
-        shell: bash
-        run: echo "pnpm_version=$(node -p 'require(`./package.json`).packageManager.split(\"@\")[1]')" >> $GITHUB_OUTPUT
-
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with: