diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml
index c1aeb5f676..a56bebe59a 100644
--- a/.github/workflows/lint-and-analyse-php.yml
+++ b/.github/workflows/lint-and-analyse-php.yml
@@ -45,11 +45,16 @@ jobs:
                   php-version: 7.2
             - name: Validate composer.json and composer.lock
               run: composer validate
-            - name: Cache module
-              uses: actions/cache@v2
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                restore-keys: |
+                  ${{ runner.os }}-composer-
             - name: Cache coding-standard
               uses: actions/cache@v2
               with:
@@ -75,11 +80,16 @@ jobs:
               with:
                   php-version: 7.2
                   extensions: mbstring, iconv, mysqli, zip, gd, bz2
-            - name: Cache module
-              uses: actions/cache@v2
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                restore-keys: |
+                  ${{ runner.os }}-composer-
             - name: Install dependencies
               run: composer install
             - name: Analyse files with phpstan
diff --git a/.github/workflows/test-selenium.yml b/.github/workflows/test-selenium.yml
index d54608dfa4..fad53d9b23 100644
--- a/.github/workflows/test-selenium.yml
+++ b/.github/workflows/test-selenium.yml
@@ -65,11 +65,16 @@ jobs:
               with:
                   php-version: ${{ matrix.php-version }}
                   extensions: mbstring, iconv, mysqli, zip, gd, bz2
-            - name: Cache module
-              uses: actions/cache@v2
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                restore-keys: |
+                  ${{ runner.os }}-composer-
             - name: Install dependencies
               run: composer install --no-interaction
             - uses: actions/setup-node@v1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c46249d55f..fb0c3145c9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,11 +81,16 @@ jobs:
                   php-version: ${{ matrix.php-version }}
                   extensions: mbstring, iconv, mysqli, zip, gd, bz2
                   coverage: xdebug
-            - name: Cache module
-              uses: actions/cache@v2
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                restore-keys: |
+                  ${{ runner.os }}-composer-
             - name: Install dependencies
               run: composer install --no-interaction ${{ matrix.composer-options }}
             - name: Run php tests
@@ -130,11 +135,16 @@ jobs:
                   php-version: ${{ matrix.php-version }}
                   extensions: ${{ matrix.extension }}, mbstring, iconv, mysqli, zip, gd
                   coverage: xdebug
-            - name: Cache module
-              uses: actions/cache@v2
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                restore-keys: |
+                  ${{ runner.os }}-composer-
             - name: Install dependencies
               run: composer install
             - name: Run php tests
@@ -177,11 +187,16 @@ jobs:
               with:
                   php-version: ${{ matrix.php-version }}
                   extensions: mbstring, iconv, mysqli, zip, gd, bz2
-            - name: Cache module
-              uses: actions/cache@v2
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                restore-keys: |
+                  ${{ runner.os }}-composer-
             - name: Install dependencies
               run: composer install
             - name: Run random php tests