diff --git a/requirements-swh.txt b/requirements-swh.txt
index c193587..24f6e64 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,2 +1,2 @@
-swh.core >= 0.0.37
+swh.core >= 0.0.41
 swh.model >= 0.0.14
diff --git a/swh/objstorage/api/client.py b/swh/objstorage/api/client.py
index d0116ae..7c6a7cf 100644
--- a/swh/objstorage/api/client.py
+++ b/swh/objstorage/api/client.py
@@ -1,78 +1,87 @@
 # Copyright (C) 2015-2017  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+import abc
 
-from swh.core.api import SWHRemoteAPI
+from swh.core.api import SWHRemoteAPI, MetaSWHRemoteAPI
 from swh.model import hashutil
 
 from ..objstorage import ObjStorage, DEFAULT_CHUNK_SIZE
 from ..exc import ObjNotFoundError, ObjStorageAPIError
 
 
-class RemoteObjStorage(ObjStorage, SWHRemoteAPI):
+class MetaRemoteObjStorage(MetaSWHRemoteAPI, abc.ABCMeta):
+    """Hackish class to make multiple inheritance with different metaclasses
+    work."""
+    pass
+
+
+class RemoteObjStorage(ObjStorage, SWHRemoteAPI,
+                       metaclass=MetaRemoteObjStorage):
     """Proxy to a remote object storage.
 
     This class allows to connect to an object storage server via
     http protocol.
 
     Attributes:
         url (string): The url of the server to connect. Must end
             with a '/'
         session: The session to send requests.
 
     """
+
     def __init__(self, url, **kwargs):
         super().__init__(api_exception=ObjStorageAPIError, url=url, **kwargs)
 
     def check_config(self, *, check_write):
         return self.post('check_config', {'check_write': check_write})
 
     def __contains__(self, obj_id):
         return self.post('content/contains', {'obj_id': obj_id})
 
     def add(self, content, obj_id=None, check_presence=True):
         return self.post('content/add', {'content': content, 'obj_id': obj_id,
                                          'check_presence': check_presence})
 
     def add_batch(self, contents, check_presence=True):
         return self.post('content/add/batch', {
             'contents': contents,
             'check_presence': check_presence,
         })
 
     def get(self, obj_id):
         ret = self.post('content/get', {'obj_id': obj_id})
         if ret is None:
             raise ObjNotFoundError(obj_id)
         else:
             return ret
 
     def get_batch(self, obj_ids):
         return self.post('content/get/batch', {'obj_ids': obj_ids})
 
     def check(self, obj_id):
         return self.post('content/check', {'obj_id': obj_id})
 
     def delete(self, obj_id):
         super().delete(obj_id)  # Check delete permission
         return self.post('content/delete', {'obj_id': obj_id})
 
     # Management methods
 
     def get_random(self, batch_size):
         return self.post('content/get/random', {'batch_size': batch_size})
 
     # Streaming methods
 
     def add_stream(self, content_iter, obj_id, check_presence=True):
         obj_id = hashutil.hash_to_hex(obj_id)
         return self.post_stream('content/add_stream/{}'.format(obj_id),
                                 params={'check_presence': check_presence},
                                 data=content_iter)
 
     def get_stream(self, obj_id, chunk_size=DEFAULT_CHUNK_SIZE):
         obj_id = hashutil.hash_to_hex(obj_id)
         return super().get_stream('content/get_stream/{}'.format(obj_id),
                                   chunk_size=chunk_size)