firejava
diff --git a/‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py
Lines changed: 6 additions & 5 deletions b/‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py
Lines changed: 6 additions & 5 deletions
diff --git a/‎sdk/keyvault/azure-keyvault-keys/tests/keys_async_preparer.py
Lines changed: 15 additions & 1 deletion b/‎sdk/keyvault/azure-keyvault-keys/tests/keys_async_preparer.py
Lines changed: 15 additions & 1 deletion
diff --git a/‎sdk/keyvault/azure-keyvault-keys/tests/recordings/test_keys_async.test_backup_restore.yaml
Lines changed: 120 additions & 174 deletions b/‎sdk/keyvault/azure-keyvault-keys/tests/recordings/test_keys_async.test_backup_restore.yaml
Lines changed: 120 additions & 174 deletions
@@ -6,7 +6,7 @@
 from azure.core.configuration import Configuration
 from azure.core.pipeline import AsyncPipeline
 from azure.core.pipeline.policies.distributed_tracing import DistributedTracingPolicy
-from azure.core.pipeline.transport import AsyncioRequestsTransport, HttpTransport
+from azure.core.pipeline.transport import AsyncHttpTransport
 from msrest.serialization import Model
 
 from ._generated import KeyVaultClient
@@ -64,7 +64,7 @@ def __init__(
         self,
         vault_url: str,
         credential: "TokenCredential",
-        transport: HttpTransport = None,
+        transport: AsyncHttpTransport = None,
         api_version: str = None,
         **kwargs: Any
     ) -> None:
@@ -91,7 +91,7 @@ def __init__(
         self._client = KeyVaultClient(credential, api_version=api_version, pipeline=pipeline, aio=True)
 
     @staticmethod
-    def _build_pipeline(config: Configuration, transport: HttpTransport, **kwargs: Any) -> AsyncPipeline:
+    def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: Any) -> AsyncPipeline:
         policies = [
             config.headers_policy,
             config.user_agent_policy,
@@ -100,11 +100,12 @@ def _build_pipeline(config: Configuration, transport: HttpTransport, **kwargs: A
             config.retry_policy,
             config.authentication_policy,
             config.logging_policy,
-            DistributedTracingPolicy()
+            DistributedTracingPolicy(),
         ]
 
         if transport is None:
-            transport = AsyncioRequestsTransport(**kwargs)
+            from azure.core.pipeline.transport import AioHttpTransport
+            transport = AioHttpTransport(**kwargs)
 
         return AsyncPipeline(transport, policies=policies)
 
 
@@ -6,17 +6,31 @@
 from unittest.mock import Mock
 
 from azure.core.credentials import AccessToken
+from azure.core.pipeline.transport import AioHttpTransport
 from azure.identity.aio import EnvironmentCredential
 
+from multidict import CIMultiDict, CIMultiDictProxy
+
 from keys_preparer import VaultClientPreparer
 
 from keys_vault_client_async import VaultClient
 
 
+class AiohttpTestTransport(AioHttpTransport):
+    """Workaround to vcrpy bug: https://github.com/kevin1024/vcrpy/pull/461
+    """
+    async def send(self, request, **config):
+        response = await super(AiohttpTestTransport, self).send(request, **config)
+        if not isinstance(response.headers, CIMultiDictProxy):
+            response.headers = CIMultiDictProxy(CIMultiDict(response.internal_response.headers))
+            response.content_type = response.headers.get("content-type")
+        return response
+
+
 class AsyncVaultClientPreparer(VaultClientPreparer):
     def create_vault_client(self, vault_uri):
         if self.is_live:
             credential = EnvironmentCredential()
         else:
             credential = Mock(get_token=asyncio.coroutine(lambda _: AccessToken("fake-token", 0)))
-        return VaultClient(vault_uri, credential)
+        return VaultClient(vault_uri, credential, transport=AiohttpTestTransport())