diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
index 8dd7a17e6..0c32dc0e6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
@@ -74,13 +74,12 @@ class File implements \MailSo\Cache\DriverInterface
 
 	public function GC(int $iTimeToClearInHours = 24) : bool
 	{
-		if (0 < $iTimeToClearInHours)
-		{
+		if (0 === $iTimeToClearInHours) {
+			\MailSo\Base\Utils::RecRmDir($this->sCacheFolder);
+		} else {
 			\MailSo\Base\Utils::RecTimeDirRemove($this->sCacheFolder, 3600 * $iTimeToClearInHours);
-			return true;
 		}
-
-		return false;
+		return true;
 	}
 
 	private function generateCachedFileName(string $sKey, bool $bMkDir = false) : string
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index d8dabeb19..4a941cbce 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -74,14 +74,9 @@ trait Admin
 
 	public function DoAdminClearCache() : array
 	{
-		$this->Cacher()->GC(1);
+		$this->Cacher()->GC(0);
 		if (\is_dir(APP_PRIVATE_DATA . 'cache')) {
-			foreach (new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator(APP_PRIVATE_DATA.'cache', \FilesystemIterator::SKIP_DOTS),
-				\RecursiveIteratorIterator::CHILD_FIRST) as $sName) {
-					$sName->isDir() ? \rmdir($sName) : \unlink($sName);
-			}
-			\clearstatcache();
+			\MailSo\Base\Utils::RecRmDir(APP_PRIVATE_DATA.'cache');
 		}
 		return $this->TrueResponse(__FUNCTION__);
 	}