diff --git a/DataStorage/Cache/Connection/RedisCache.php b/DataStorage/Cache/Connection/RedisCache.php
index 93d44738b..4576820b0 100644
--- a/DataStorage/Cache/Connection/RedisCache.php
+++ b/DataStorage/Cache/Connection/RedisCache.php
@@ -111,7 +111,7 @@ final class RedisCache extends ConnectionAbstract
         }
 
         if ($expire > 0) {
-            $this->con->setEx((string) $key, $expire * 1000, $this->build($value));
+            $this->con->setEx((string) $key, $expire, $this->build($value));
 
             return;
         }
@@ -129,7 +129,7 @@ final class RedisCache extends ConnectionAbstract
         }
 
         if ($expire > 0) {
-            return $this->con->setNx((string) $key, $this->build($value), $expire * 1000);
+            return $this->con->setNx((string) $key, $this->build($value), $expire);
         }
 
         return $this->con->setNx((string) $key, $this->build($value));
@@ -207,7 +207,7 @@ final class RedisCache extends ConnectionAbstract
         $this->con->rename((string) $old, (string) $new);
 
         if ($expire > 0) {
-            $this->con->expire((string) $new, $expire * 1000);
+            $this->con->expire((string) $new, $expire);
         }
     }
 
@@ -264,7 +264,7 @@ final class RedisCache extends ConnectionAbstract
     public function updateExpire(int | string $key, int $expire = -1) : bool
     {
         if ($expire > 0) {
-            $this->con->expire((string) $key, $expire * 1000);
+            $this->con->expire((string) $key, $expire);
         }
 
         return true;
@@ -302,7 +302,7 @@ final class RedisCache extends ConnectionAbstract
         }
 
         if ($this->con->exists((string) $key) > 0) {
-            $this->set((string) $key, $value, $expire * 1000);
+            $this->set((string) $key, $value, $expire);
 
             return true;
         }
diff --git a/tests/Message/Mail/MailHandlerTest.php b/tests/Message/Mail/MailHandlerTest.php
index cc237f61a..80895acc6 100644
--- a/tests/Message/Mail/MailHandlerTest.php
+++ b/tests/Message/Mail/MailHandlerTest.php
@@ -21,6 +21,7 @@ use phpOMS\Message\Mail\Imap;
 use phpOMS\Message\Mail\MailHandler;
 use phpOMS\Message\Mail\SubmitType;
 use phpOMS\System\CharsetType;
+use phpOMS\System\OperatingSystem;
 
 /**
  * @testdox phpOMS\tests\Message\MailHandlerTest: Abstract mail handler