diff --git a/.github/workflows/build-unit-tests.yml b/.github/workflows/build-unit-tests.yml
index 5cd279d..291ad13 100644
--- a/.github/workflows/build-unit-tests.yml
+++ b/.github/workflows/build-unit-tests.yml
@@ -21,14 +21,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-        # 2. Restore npm and cypress cache manually
-      - name: Restore npm and cypress cache
+        # 2. Restore npm cache manually
+      - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
         with:
-          path: |
-            ~/.npm
-            ~/.cypress/Cypress
+          path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
diff --git a/.github/workflows/generateDocs.yml b/.github/workflows/generateDocs.yml
index 1edff0f..7371365 100644
--- a/.github/workflows/generateDocs.yml
+++ b/.github/workflows/generateDocs.yml
@@ -23,14 +23,12 @@ jobs:
           node-version:
             ${{ matrix.node-version }}
 
-            # 2. Restore npm and cypress cache manually
-      - name: Restore npm and cypress cache
+            # 2. Restore npm cache manually
+      - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
         with:
-          path: |
-            ~/.npm
-            ~/.cypress/Cypress
+          path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
index f32f2c2..1442df4 100644
--- a/.github/workflows/npmpublish.yml
+++ b/.github/workflows/npmpublish.yml
@@ -23,14 +23,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-        # 2. Restore npm and cypress cache manually
-      - name: Restore npm and cypress cache
+        # 2. Restore npm cache manually
+      - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
         with:
-          path: |
-            ~/.npm
-            ~/.cypress/Cypress
+          path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
index a023157..b546c62 100644
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -21,21 +21,31 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      # 2. Restore npm and cypress cache manually
-      - name: Restore npm and cypress cache
+      # 2. Restore npm cache manually
+      - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
         with:
           path: |
             ~/.npm
-            ~/.cache/Cypress
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
+      - name: Cache Cypress binary
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/Cypress
+          key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            cypress-${{ runner.os }}-
+
       - name: Install Dependencies
         run: npm ci
 
+      - name: Install Cypress binary
+        run: npx cypress install
+
       - name: Install Rimraf
         run: npm i rimraf