diff --git a/.github/workflows/unit-tests-monitoring.yml b/.github/workflows/unit-tests-monitoring.yml
index 5fee05a..e6c207c 100644
--- a/.github/workflows/unit-tests-monitoring.yml
+++ b/.github/workflows/unit-tests-monitoring.yml
@@ -1,4 +1,4 @@
-name: Monitoring tests
+name: Monitoring App Backend tests
 
 on:
   pull_request:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 373a642..7b2a64b 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -9,17 +9,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
       - uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.5.0
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "pnpm"
+#          cache: "pnpm"
+
       - name: Install dependencies
         run: pnpm install
+
       - name: Generate schema
         run: pnpm generate
+
       - name: Test
         run: pnpm test:ci
 # TODO: Add coverage - crawl through every package