diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 74f9a4e532..25082f82ed 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,12 +14,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v3
       with:
         node-version: 16.x
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+        cache: 'yarn'
+        cache-dependency-path: |
+          src/packages/backend/yarn.lock
+          src/packages/client/yarn.lock
     - run: yarn install
     - run: yarn lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e9585f96d..0203995ac9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,9 +33,13 @@ jobs:
       with:
         submodules: true
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
+        cache: 'yarn'
+        cache-dependency-path: |
+          src/packages/backend/yarn.lock
+          src/packages/client/yarn.lock
     - name: Install dependencies
       run: yarn install
     - name: Check yarn.lock
@@ -80,13 +84,13 @@ jobs:
     #- uses: browser-actions/setup-firefox@latest
     #  if: ${{ matrix.browser == 'firefox' }}
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+        cache: 'yarn'
+        cache-dependency-path: |
+          src/packages/backend/yarn.lock
+          src/packages/client/yarn.lock
     - name: Install dependencies
       run: yarn install
     - name: Check yarn.lock