diff --git a/classes/cache/Cache.php b/classes/cache/Cache.php
index 9343f04e7..994f06c31 100755
--- a/classes/cache/Cache.php
+++ b/classes/cache/Cache.php
@@ -144,7 +144,7 @@ abstract class CacheCore
 	 */
 	public function set($key, $value, $ttl = 0)
 	{
-		if ($this->_set($key, $value))
+		if ($this->_set($key, $value, $ttl))
 		{
 			if ($ttl < 0)
 				$ttl = 0;
diff --git a/classes/cache/CacheFs.php b/classes/cache/CacheFs.php
index 538ea18b8..4b37b58a3 100755
--- a/classes/cache/CacheFs.php
+++ b/classes/cache/CacheFs.php
@@ -149,6 +149,7 @@ class CacheFsCore extends Cache
 	 */
 	protected function getFilename($key)
 	{
+		$key = md5($key);
 		$path = _PS_CACHEFS_DIRECTORY_;
 		for ($i = 0; $i < $this->depth; $i++)
 			$path .= $key[$i].'/';
diff --git a/classes/cache/CacheMemcache.php b/classes/cache/CacheMemcache.php
index 99ef0ee92..0018683a2 100755
--- a/classes/cache/CacheMemcache.php
+++ b/classes/cache/CacheMemcache.php
@@ -65,8 +65,9 @@ class CacheMemcacheCore extends Cache
 					        {
 					           foreach ($dump as $entries)
 					           {
-					                if ($entries)
-					                    $this->keys = array_merge($this->keys, array_keys($entries));
+									if($entries)
+										foreach ($entries as $key => $data)
+											$this->keys[$key] = $data[1];
 					           }
 					        }
 					    }