diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
index 65a673df5..9e5f8af1c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
@@ -72,14 +72,16 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      *
      * @param name The name of the key.
      * @param options Optional parameters for this operation.
+     * @param context The context for the operation can be used for request cancellation.
      * @return The Key wrapped in the Response.
      */
     Azure::Core::Response<KeyVaultKey> GetKey(
         std::string const& name,
-        GetKeyOptions const& options = GetKeyOptions()) const
+        GetKeyOptions const& options = GetKeyOptions(),
+        Azure::Core::Context const& context = Azure::Core::Context()) const
     {
       return m_pipeline->SendRequest<KeyVaultKey>(
-          options.Context,
+          context,
           Azure::Core::Http::HttpMethod::Get,
           [name](Azure::Core::Http::RawResponse const& rawResponse) {
             return Details::KeyVaultKeyDeserialize(name, rawResponse);
@@ -96,15 +98,17 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * @param keyType The type of key to create. See #Azure::Security::KeyVault::Keys::KeyTypeEnum.
      * @param options Optional parameters for this operation. See
      * #Azure::Security::KeyVault::Keys::CreateKeyOptions.
+     * @param context The context for the operation can be used for request cancellation.
      * @return The Key wrapped in the Response.
      */
     Azure::Core::Response<KeyVaultKey> CreateKey(
         std::string const& name,
         KeyTypeEnum keyType,
-        CreateKeyOptions const& options = CreateKeyOptions()) const
+        CreateKeyOptions const& options = CreateKeyOptions(),
+        Azure::Core::Context const& context = Azure::Core::Context()) const
     {
       return m_pipeline->SendRequest<KeyVaultKey>(
-          options.Context,
+          context,
           Azure::Core::Http::HttpMethod::Post,
           Details::KeyRequestParameters(keyType, options),
           [name](Azure::Core::Http::RawResponse const& rawResponse) {
@@ -113,5 +117,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
           {Details::KeysPath, name, "create"});
     }
   };
-
 }}}} // namespace Azure::Security::KeyVault::Keys
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
index b726b6a2a..89ea492b8 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
@@ -22,11 +22,6 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
 
   struct CreateKeyOptions
   {
-    /**
-     * @brief Context for cancelling long running operations.
-     */
-    Azure::Core::Context Context;
-
     std::list<KeyOperation> KeyOperations;
 
     Azure::Core::Nullable<Azure::Core::DateTime> NotBefore;