diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java
index ff8ae3da57824..72484bc072f91 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java
@@ -114,7 +114,7 @@ public String getTenantId() {
      * the requested token.
      * @return the updated TokenRequestContext.
      */
-    public TokenRequestContext setEnableCae(boolean enableCae) {
+    public TokenRequestContext setCaeEnabled(boolean enableCae) {
         this.enableCae = enableCae;
         return this;
     }
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index cdbce4cc14e8d..91166113b3346 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.42.0-beta.1</version> <!-- {x-version-update;beta_com.azure:azure-core;dependency} -->
+      <version>1.42.0-beta.2</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientCertificateCredentialTest.java b/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientCertificateCredentialTest.java
index cb09e39d0e324..86bd068b1df8a 100644
--- a/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientCertificateCredentialTest.java
+++ b/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientCertificateCredentialTest.java
@@ -163,7 +163,7 @@ public void testValidPemCertificatePathCAE() throws Exception {
         String pemPath = "C:\\fakepath\\cert1.pem";
         String token1 = "token1";
 
-        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setEnableCae(true);
+        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setCaeEnabled(true);
         OffsetDateTime expiresAt = OffsetDateTime.now(ZoneOffset.UTC).plusHours(1);
 
         // mock
diff --git a/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientSecretCredentialTest.java b/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientSecretCredentialTest.java
index 50ae74cba60b9..5e43fb9341e17 100644
--- a/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientSecretCredentialTest.java
+++ b/sdk/identity/azure-identity/src/test/java/com/azure/identity/ClientSecretCredentialTest.java
@@ -92,8 +92,8 @@ public void testValidSecretsCAE() throws Exception {
         String secret = "secret";
         String token1 = "token1";
         String token2 = "token2";
-        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setEnableCae(true);
-        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setEnableCae(true);
+        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setCaeEnabled(true);
+        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setCaeEnabled(true);
         OffsetDateTime expiresAt = OffsetDateTime.now(ZoneOffset.UTC).plusHours(1);
 
         // mock
diff --git a/sdk/identity/azure-identity/src/test/java/com/azure/identity/DeviceCodeCredentialTest.java b/sdk/identity/azure-identity/src/test/java/com/azure/identity/DeviceCodeCredentialTest.java
index 844dd9cd06ef9..ebf38ecb5e14d 100644
--- a/sdk/identity/azure-identity/src/test/java/com/azure/identity/DeviceCodeCredentialTest.java
+++ b/sdk/identity/azure-identity/src/test/java/com/azure/identity/DeviceCodeCredentialTest.java
@@ -105,8 +105,8 @@ public void testValidDeviceCodeCAE() throws Exception {
         Consumer<DeviceCodeInfo> consumer = deviceCodeInfo -> { /* do nothing */ };
         String token1 = "token1";
         String token2 = "token2";
-        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setEnableCae(true);
-        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setEnableCae(true);
+        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setCaeEnabled(true);
+        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setCaeEnabled(true);
         OffsetDateTime expiresAt = OffsetDateTime.now(ZoneOffset.UTC).plusHours(1);
 
         // mock
diff --git a/sdk/identity/azure-identity/src/test/java/com/azure/identity/InteractiveBrowserCredentialTest.java b/sdk/identity/azure-identity/src/test/java/com/azure/identity/InteractiveBrowserCredentialTest.java
index bb20b983e4481..63f0412572682 100644
--- a/sdk/identity/azure-identity/src/test/java/com/azure/identity/InteractiveBrowserCredentialTest.java
+++ b/sdk/identity/azure-identity/src/test/java/com/azure/identity/InteractiveBrowserCredentialTest.java
@@ -104,8 +104,8 @@ public void testValidInteractiveCAE() throws Exception {
         // setup
         String token1 = "token1";
         String token2 = "token2";
-        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setEnableCae(true);
-        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setEnableCae(true);
+        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setCaeEnabled(true);
+        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setCaeEnabled(true);
         OffsetDateTime expiresAt = OffsetDateTime.now(ZoneOffset.UTC).plusHours(1);
         int port = random.nextInt(10000) + 10000;
 
diff --git a/sdk/identity/azure-identity/src/test/java/com/azure/identity/UsernamePasswordCredentialTest.java b/sdk/identity/azure-identity/src/test/java/com/azure/identity/UsernamePasswordCredentialTest.java
index 9eec5c7ad7720..570d69c58846a 100644
--- a/sdk/identity/azure-identity/src/test/java/com/azure/identity/UsernamePasswordCredentialTest.java
+++ b/sdk/identity/azure-identity/src/test/java/com/azure/identity/UsernamePasswordCredentialTest.java
@@ -109,8 +109,8 @@ public void testValidUserCredentialCAE() throws Exception {
         String fakePasswordPlaceholder = "fakePasswordPlaceholder";
         String token1 = "token1";
         String token2 = "token2";
-        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setEnableCae(true);
-        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setEnableCae(true);
+        TokenRequestContext request1 = new TokenRequestContext().addScopes("https://management.azure.com").setCaeEnabled(true);
+        TokenRequestContext request2 = new TokenRequestContext().addScopes("https://vault.azure.net").setCaeEnabled(true);
         OffsetDateTime expiresAt = OffsetDateTime.now(ZoneOffset.UTC).plusHours(1);
 
         // mock