diff --git a/.github/actions/components/caching/action.yml b/.github/actions/components/caching/action.yml
index 7bc811c0c..16c7db67f 100644
--- a/.github/actions/components/caching/action.yml
+++ b/.github/actions/components/caching/action.yml
@@ -18,22 +18,13 @@ inputs:
     default: |
       .venv
       .timestamp
-      **/.terraform
-      **/dist/*zip
-      **/tfplan
-      **/swagger.yaml
-      **/infrastructure/terraform/**/output.json
       .downloads
-      **/fhir/r4/*models.py
       .tool-versions
       pyproject.toml
       poetry.lock
-      **/make.py
-      **/infrastructure/swagger/*.yaml
-      **/infrastructure/swagger/**/*.yaml
-      **/fhir-base/*json
-      **/.proxygen/*
-      **/infrastructure/terraform/**/*.asl.json
+      src
+      infrastructure
+      !**/.terraform/modules/**/*
 
 runs:
   using: "composite"
@@ -51,6 +42,10 @@ runs:
         restore-keys: |
           ${{ env.GITHUB_SHA_SHORT }}-${{ inputs.cache-suffix == '' && 'head' || inputs.cache-suffix }}
 
+    - id: tree
+      shell: bash
+      run: tree -D -I '__pycache__|.git|.venv|.hypothesis|.pytest_cache'
+
     - if: ${{ inputs.save-or-restore == 'save' }}
       id: save-cache
       uses: actions/cache/save@v3
diff --git a/.github/actions/make/action.yml b/.github/actions/make/action.yml
index 9b08cf2c4..690fd82d1 100644
--- a/.github/actions/make/action.yml
+++ b/.github/actions/make/action.yml
@@ -57,7 +57,7 @@ runs:
     - name: Run "make" command
       shell: bash
       run: |
-        make ${{ inputs.command }} \
+        make --debug ${{ inputs.command }} \
           AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
           AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
           AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN}