diff --git a/riak/client/__init__.py b/riak/client/__init__.py
index 7944d8fb..1d7cfa68 100644
--- a/riak/client/__init__.py
+++ b/riak/client/__init__.py
@@ -267,12 +267,8 @@ def bucket(self, name, bucket_type='default'):
             raise TypeError('bucket_type must be a string '
                             'or riak.bucket.BucketType')
 
-        if (bucket_type, name) in self._buckets:
-            return self._buckets[(bucket_type, name)]
-        else:
-            bucket = RiakBucket(self, name, bucket_type)
-            self._buckets[(bucket_type, name)] = bucket
-            return bucket
+        return self._buckets.setdefault((bucket_type, name),
+                                        RiakBucket(self, name, bucket_type))
 
     def bucket_type(self, name):
         """