diff --git a/.github/workflows/_internal_check_extension.yaml b/.github/workflows/_internal_check_extension.yaml
index 3a19b07..1137ffb 100644
--- a/.github/workflows/_internal_check_extension.yaml
+++ b/.github/workflows/_internal_check_extension.yaml
@@ -39,3 +39,4 @@ jobs:
     with:
       path: _test/demo-package
       matrix: ${{ needs.compute_matrix.outputs.matrix }}
+      stamp: true
diff --git a/.github/workflows/check-extension.yaml b/.github/workflows/check-extension.yaml
index 3cec1e7..1e25328 100644
--- a/.github/workflows/check-extension.yaml
+++ b/.github/workflows/check-extension.yaml
@@ -27,9 +27,15 @@ on:
     composer_cache_key:
         type: string
         required: false
-        default: "_mageos"
+        default: ""
         description: A key to version the composer cache. Can be incremented if you need to bust the cache.
 
+    stamp:
+        type: boolean
+        required: false
+        default: false
+        description: "Cache the vendor/ directory in addition to the Composer download cache."
+
   secrets:
     composer_auth:
       required: false
@@ -54,10 +60,6 @@ jobs:
             magento_repository: ${{ inputs.magento_repository }}
             composer_auth: ${{ secrets.composer_auth }}
 
-        - uses: graycoreio/github-actions-magento2/cache-magento@main
-          with:
-            composer_cache_key: ${{ inputs.composer_cache_key }}
-
         - name: Add extension repository
           working-directory: ${{ steps.setup-magento.outputs.path }}
           run: composer config repositories.local path ${{ github.workspace }}/${{ inputs.path }}
@@ -70,6 +72,15 @@ jobs:
           working-directory: ${{ steps.setup-magento.outputs.path }}
           run: composer require "${{ steps.package.outputs.name }}:@dev" --no-install
 
+        - run: composer update --no-install
+          working-directory: ${{ steps.setup-magento.outputs.path }}
+
+        - uses: graycoreio/github-actions-magento2/cache-magento@main
+          with:
+            composer_cache_key: ${{ inputs.composer_cache_key && format('{0} | {1}', inputs.composer_cache_key, matrix.magento) || matrix.magento }}
+            working-directory: ${{ steps.setup-magento.outputs.path }}
+            stamp: ${{ inputs.stamp }}
+
         - name: Composer install
           working-directory: ${{ steps.setup-magento.outputs.path }}
           run: composer install
@@ -114,10 +125,6 @@ jobs:
             magento_repository: ${{ inputs.magento_repository }}
             composer_auth: ${{ secrets.composer_auth }}
 
-        - uses: graycoreio/github-actions-magento2/cache-magento@main
-          with:
-            composer_cache_key: ${{ inputs.composer_cache_key }}
-
         - name: Add extension repository
           working-directory: ${{ steps.setup-magento.outputs.path }}
           run: composer config repositories.local path ${{ github.workspace }}/${{ inputs.path }}
@@ -132,6 +139,15 @@ jobs:
           env:
             COMPOSER_AUTH: ${{ secrets.composer_auth }}
 
+        - run: composer update --no-install
+          working-directory: ${{ steps.setup-magento.outputs.path }}
+
+        - uses: graycoreio/github-actions-magento2/cache-magento@main
+          with:
+            composer_cache_key: ${{ inputs.composer_cache_key && format('{0} | {1}', inputs.composer_cache_key, matrix.magento) || matrix.magento }}
+            working-directory: ${{ steps.setup-magento.outputs.path }}
+            stamp: ${{ inputs.stamp }}
+
         - name: Composer install
           working-directory: ${{ steps.setup-magento.outputs.path }}
           run: composer install
@@ -157,6 +173,10 @@ jobs:
           tools: composer:v${{ matrix.composer }}
           coverage: none
 
+      - uses: graycoreio/github-actions-magento2/cache-magento@main
+        with:
+          composer_cache_key: ${{ inputs.composer_cache_key && format('{0} | {1}', inputs.composer_cache_key, matrix.magento) || matrix.magento }}
+
       - uses: graycoreio/github-actions-magento2/coding-standard@main
         with:
           path: ${{ inputs.path }}
@@ -181,10 +201,6 @@ jobs:
           magento_repository: ${{ inputs.magento_repository }}
           composer_auth: ${{ secrets.composer_auth }}
 
-      - uses: graycoreio/github-actions-magento2/cache-magento@main
-        with:
-          composer_cache_key: ${{ inputs.composer_cache_key }}
-
       - name: Add extension repository
         working-directory: ${{ steps.setup-magento.outputs.path }}
         run: composer config repositories.local path ${{ github.workspace }}/${{ inputs.path }}
@@ -199,6 +215,15 @@ jobs:
         env:
           COMPOSER_AUTH: ${{ secrets.composer_auth }}
 
+      - run: composer update --no-install
+        working-directory: ${{ steps.setup-magento.outputs.path }}
+
+      - uses: graycoreio/github-actions-magento2/cache-magento@main
+        with:
+          composer_cache_key: ${{ inputs.composer_cache_key && format('{0} | {1}', inputs.composer_cache_key, matrix.magento) || matrix.magento }}
+          working-directory: ${{ steps.setup-magento.outputs.path }}
+          stamp: ${{ inputs.stamp }}
+
       - name: Composer install
         working-directory: ${{ steps.setup-magento.outputs.path }}
         run: composer install