diff --git a/.github/workflows/ci-3p-django-framework.yml b/.github/workflows/ci-3p-django-framework.yml
index f06702434..75dd77d01 100644
--- a/.github/workflows/ci-3p-django-framework.yml
+++ b/.github/workflows/ci-3p-django-framework.yml
@@ -18,6 +18,7 @@ env:
   TESTNAME: django-framework
   TESTDIST: debian12
   SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BRANCH: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_branch || github.ref_name }}
 
 jobs:
   test:
@@ -81,6 +82,7 @@ jobs:
 #        echo "Cache available '${BLDCACHE}'"
 
     - name: Cache restore bin
+      if: ${{ env.BRANCH != 'none' }}
       uses: actions/cache/restore@v4
       with:
         key: ${{ env.BLDCACHE }}
@@ -98,7 +100,7 @@ jobs:
         git switch ${{ env.TESTTREE }}
         
         # use cached build
-        rm -rf ./proxysql && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql . || true
         
         # extend timout
         cd test_django-framework
diff --git a/.github/workflows/ci-3p-laravel-framework.yml b/.github/workflows/ci-3p-laravel-framework.yml
index 2d064a68e..99191acce 100644
--- a/.github/workflows/ci-3p-laravel-framework.yml
+++ b/.github/workflows/ci-3p-laravel-framework.yml
@@ -18,6 +18,7 @@ env:
   TESTNAME: laravel-framework
   TESTDIST: debian12
   SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BRANCH: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_branch || github.ref_name }}
 
 jobs:
   test:
@@ -81,6 +82,7 @@ jobs:
 #        echo "Cache available '${BLDCACHE}'"
 
     - name: Cache restore bin
+      if: ${{ env.BRANCH != 'none' }}
       uses: actions/cache/restore@v4
       with:
         key: ${{ env.BLDCACHE }}
@@ -101,7 +103,7 @@ jobs:
         git rebase main -f -s recursive -X theirs
         
         # use cached build
-        rm -rf ./proxysql && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql . || true
         
         # extend timout
         #cd test_laravel-framework
diff --git a/.github/workflows/ci-3p-mariadb-connector-c.yml b/.github/workflows/ci-3p-mariadb-connector-c.yml
index 23aa9fc27..177aa3bfe 100644
--- a/.github/workflows/ci-3p-mariadb-connector-c.yml
+++ b/.github/workflows/ci-3p-mariadb-connector-c.yml
@@ -18,6 +18,7 @@ env:
   TESTNAME: mariadb-connector-c
   TESTDIST: debian12
   SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BRANCH: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_branch || github.ref_name }}
 
 jobs:
   test:
@@ -81,6 +82,7 @@ jobs:
 #        echo "Cache available '${BLDCACHE}'"
 
     - name: Cache restore bin
+      if: ${{ env.BRANCH != 'none' }}
       uses: actions/cache/restore@v4
       with:
         key: ${{ env.BLDCACHE }}
@@ -101,7 +103,7 @@ jobs:
         #git -C ./proxysql pull --tags
         
         # use cached build
-        rm -rf ./proxysql && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql . || true
         
         # extend timout
         cd test_mariadb-connector-c
diff --git a/.github/workflows/ci-3p-mysql-connector-j.yml b/.github/workflows/ci-3p-mysql-connector-j.yml
index d688aa929..40014a217 100644
--- a/.github/workflows/ci-3p-mysql-connector-j.yml
+++ b/.github/workflows/ci-3p-mysql-connector-j.yml
@@ -18,6 +18,7 @@ env:
   TESTNAME: mysql-connector-j
   TESTDIST: debian12
   SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BRANCH: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_branch || github.ref_name }}
 
 jobs:
   test:
@@ -81,6 +82,7 @@ jobs:
 #        echo "Cache available '${BLDCACHE}'"
 
     - name: Cache restore bin
+      if: ${{ env.BRANCH != 'none' }}
       uses: actions/cache/restore@v4
       with:
         key: ${{ env.BLDCACHE }}
@@ -98,7 +100,7 @@ jobs:
         git switch ${{ env.TESTTREE }}
         
         # use cached build
-        rm -rf ./proxysql && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql . || true
         
         # extend timout
         cd test_mysql-connector-j
diff --git a/.github/workflows/ci-3p-php-pdo-mysql.yml b/.github/workflows/ci-3p-php-pdo-mysql.yml
index 2f2cb35d3..7f690a9c7 100644
--- a/.github/workflows/ci-3p-php-pdo-mysql.yml
+++ b/.github/workflows/ci-3p-php-pdo-mysql.yml
@@ -18,6 +18,7 @@ env:
   TESTNAME: php-pdo-mysql
   TESTDIST: debian12
   SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BRANCH: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_branch || github.ref_name }}
 
 jobs:
   test:
@@ -81,6 +82,7 @@ jobs:
 #        echo "Cache available '${BLDCACHE}'"
 
     - name: Cache restore bin
+      if: ${{ env.BRANCH != 'none' }}
       uses: actions/cache/restore@v4
       with:
         key: ${{ env.BLDCACHE }}
@@ -98,7 +100,7 @@ jobs:
         git switch ${{ env.TESTTREE }}
 
         # use cached build
-        rm -rf ./proxysql && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql . || true
 
         # extend timout
         cd test_php-pdo-mysql
diff --git a/.github/workflows/ci-3p-postgresql.yml b/.github/workflows/ci-3p-postgresql.yml
index 62b595a48..1722184cd 100644
--- a/.github/workflows/ci-3p-postgresql.yml
+++ b/.github/workflows/ci-3p-postgresql.yml
@@ -18,6 +18,7 @@ env:
   TESTNAME: postgresql
   TESTDIST: debian12
   SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BRANCH: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_branch || github.ref_name }}
 
 jobs:
   test:
@@ -103,7 +104,7 @@ jobs:
         git switch ${{ env.TESTTREE }}
         
         # use cached build
-        rm -rf ./proxysql && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql . || true
         
         # set tested database infra
         #sed -i 's/^fn_test_proxysql m/#fn_test_proxysql m/' run-tests.bash