diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
new file mode 100644
index 000000000..2171cc2d5
--- /dev/null
+++ b/.github/workflows/cleanup-cache-at-pr-closing.yml
@@ -0,0 +1,24 @@
+name: ocelot.social cache cleanup on pr closing
+
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  clean-branch-cache:
+    name: Clean branch cache
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name:
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          gh actions-cache list --branch TODO:this_current_branch --order desc --sort created-at
+ #         gh actions-cache delete -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 3f7559980..a24a9415e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Restore Neo4J cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/neo4j.tar
+          path: /tmp/neo4j.tarTEST
           key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 81c068ba5..059e758bf 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -61,7 +61,7 @@ jobs:
         id: cache
         with:
           path: |
-            /opt/cucumber-json-formatter
+            /opt/cucumber-json-formatterTEST
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 364ad4796..80b93f3f7 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Restore webapp cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/webapp.tar
+          path: /tmp/webapp.tarTEST
           key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image