diff --git a/lib/Lib/Driver/Socket/RedisSocket.js b/lib/Lib/Driver/Socket/RedisSocket.js
index e019d604..737cadc5 100644
--- a/lib/Lib/Driver/Socket/RedisSocket.js
+++ b/lib/Lib/Driver/Socket/RedisSocket.js
@@ -70,8 +70,15 @@ module.exports = Class(function(){
     get: function(name){
       return this.wrap('get', [name]);
     },
-    set: function(name, value){
-      return this.wrap('set', [name, value]);
+    set: function(name, value, timeout){
+      var setP = [this.wrap('set', [name, value])];
+      if (timeout !== undefined) {
+        setP.push(this.expire(name, timeout));
+      }
+      return Promise.all(setP);
+    },
+    expire: function(name, timeout){
+      return this.wrap('expire', [name, timeout]);
     }
   }
 });
\ No newline at end of file