diff --git a/deploy.php b/deploy.php
index 96dc7f2..68b3d06 100644
--- a/deploy.php
+++ b/deploy.php
@@ -154,7 +154,7 @@ task('typo3:extension:setup', function () {
 
 desc('TYPO3 - Clear all caches');
 task('typo3:cache:flush', function () {
-    run('{{bin/php}} {{release_path}}/{{bin/typo3}} cache:flush');
+    run('{{bin/php}} {{current_path}}/{{bin/typo3}} cache:flush');
 });
 
 desc('Link the production fileadmin into the release');
@@ -192,5 +192,7 @@ task('deploy', [
 // is the static docroot. Not needed either: the front controller stubs in the static docroots resolve
 // "current" with readlink() on every request, so a new release is always loaded under new paths.
 after('deploy:symlink', 'typo3:cache:flush');
+// A rollback switches the code back; pages cached by the other release must not survive it
+after('rollback', 'typo3:cache:flush');
 
 after('deploy:failed', 'deploy:unlock');