Merge branch 'master' into update_changelog

lib/suo/client/base.rb

@@ -56,10 +56,7 @@ module Suo
         retry_with_timeout do
           val, cas = get
 
-          if val.nil?
+          cas = initial_set if val.nil?
-            initial_set
-            next
-          end
 
           cleared_locks = deserialize_and_clear_locks(val)
 
@@ -102,10 +99,7 @@ module Suo
         retry_with_timeout do
           val, cas = get
 
-          if val.nil?
+          cas = initial_set if val.nil?
-            initial_set
-            next
-          end
 
           cleared_locks = deserialize_and_clear_locks(val)
 

lib/suo/client/memcached.rb

@@ -26,6 +26,8 @@ module Suo
 
       def initial_set(val = BLANK_STR)
         @client.set(@key, val)
+        _val, cas = @client.get_cas(@key)
+        cas
       end
     end
   end

lib/suo/client/redis.rb

@@ -39,7 +39,8 @@ module Suo
       end
 
       def initial_set(val = BLANK_STR)
-        @client.set(@key, val)
+        set(val, nil)
+        nil
       end
     end
   end