diff --git a/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java b/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java
index 554dcdd662..c58ff3e210 100644
--- a/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java
+++ b/rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java
@@ -356,7 +356,7 @@ public class CachingRlsLbClientTest {
         /* lookupServiceTimeoutInMillis= */ TimeUnit.SECONDS.toMillis(2),
         /* maxAgeInMillis= */ TimeUnit.SECONDS.toMillis(300),
         /* staleAgeInMillis= */ TimeUnit.SECONDS.toMillis(240),
-        /* cacheSize= */ 1000,
+        /* cacheSizeBytes= */ 1000,
         /* validTargets= */ ImmutableList.of("a valid target"),
         /* defaultTarget= */ "us_east_1.cloudbigtable.googleapis.com");
   }
diff --git a/rls/src/test/java/io/grpc/rls/RlsProtoConvertersTest.java b/rls/src/test/java/io/grpc/rls/RlsProtoConvertersTest.java
index cb19b3c79f..2f7d84d6b1 100644
--- a/rls/src/test/java/io/grpc/rls/RlsProtoConvertersTest.java
+++ b/rls/src/test/java/io/grpc/rls/RlsProtoConvertersTest.java
@@ -195,7 +195,7 @@ public class RlsProtoConvertersTest {
             /* lookupServiceTimeoutInMillis= */ TimeUnit.SECONDS.toMillis(2),
             /* maxAgeInMillis= */ TimeUnit.SECONDS.toMillis(300),
             /* staleAgeInMillis= */ TimeUnit.SECONDS.toMillis(240),
-            /* cacheSize= */ 1000,
+            /* cacheSizeBytes= */ 1000,
             /* validTargets= */ ImmutableList.of("a valid target"),
             /* defaultTarget= */ "us_east_1.cloudbigtable.googleapis.com");
 
diff --git a/rls/src/test/java/io/grpc/rls/RlsRequestFactoryTest.java b/rls/src/test/java/io/grpc/rls/RlsRequestFactoryTest.java
index 157688b7e4..57d21e4fda 100644
--- a/rls/src/test/java/io/grpc/rls/RlsRequestFactoryTest.java
+++ b/rls/src/test/java/io/grpc/rls/RlsRequestFactoryTest.java
@@ -62,7 +62,7 @@ public class RlsRequestFactoryTest {
           /* lookupServiceTimeoutInMillis= */ TimeUnit.SECONDS.toMillis(2),
           /* maxAgeInMillis= */ TimeUnit.SECONDS.toMillis(300),
           /* staleAgeInMillis= */ TimeUnit.SECONDS.toMillis(240),
-          /* cacheSize= */ 1000,
+          /* cacheSizeBytes= */ 1000,
           /* validTargets= */ ImmutableList.of("a valid target"),
           /* defaultTarget= */ "us_east_1.cloudbigtable.googleapis.com");
 
diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java
index ec81022c92..e9f8efda60 100644
--- a/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java
@@ -744,43 +744,42 @@ public class XdsClientImplTest {
     verify(configWatcher).onConfigChanged(configUpdateCaptor.capture());
     List<EnvoyProtoData.Route> routes = configUpdateCaptor.getValue().getRoutes();
     assertThat(routes).hasSize(4);
-    assertThat(routes.get(0)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // path match with cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ null,
-                /* path= */ "/service1/method1"),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
-    assertThat(routes.get(1)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // path match with weighted cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ null,
-                /* path= */ "/service2/method2"),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L),
-                null,
-                ImmutableList.of(
-                    new EnvoyProtoData.ClusterWeight("cl21.googleapis.com", 30),
-                    new EnvoyProtoData.ClusterWeight("cl22.googleapis.com", 70)
-                ))));
-    assertThat(routes.get(2)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // prefix match with cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ "/service1/",
-                /* path= */ null),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
-    assertThat(routes.get(3)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // default match with cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ "",
-                /* path= */ null),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L), "cluster.googleapis.com", null)));
+    assertThat(routes.get(0))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // path match with cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ null,/* pathExactMatch= */ "/service1/method1"),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
+    assertThat(routes.get(1))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // path match with weighted cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ null,/* pathExactMatch= */ "/service2/method2"),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L),
+                    null,
+                    ImmutableList.of(
+                        new EnvoyProtoData.ClusterWeight("cl21.googleapis.com", 30),
+                        new EnvoyProtoData.ClusterWeight("cl22.googleapis.com", 70)))));
+    assertThat(routes.get(2))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // prefix match with cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ "/service1/",/* pathExactMatch= */ null),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
+    assertThat(routes.get(3))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // default match with cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ "",/* pathExactMatch= */ null),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L), "cluster.googleapis.com", null)));
   }
 
   /**
diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTestV2.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTestV2.java
index fcd268e019..b1faa4e3c3 100644
--- a/xds/src/test/java/io/grpc/xds/XdsClientImplTestV2.java
+++ b/xds/src/test/java/io/grpc/xds/XdsClientImplTestV2.java
@@ -745,43 +745,42 @@ public class XdsClientImplTestV2 {
     verify(configWatcher).onConfigChanged(configUpdateCaptor.capture());
     List<EnvoyProtoData.Route> routes = configUpdateCaptor.getValue().getRoutes();
     assertThat(routes).hasSize(4);
-    assertThat(routes.get(0)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // path match with cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ null,
-                /* path= */ "/service1/method1"),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
-    assertThat(routes.get(1)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // path match with weighted cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ null,
-                /* path= */ "/service2/method2"),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L),
-                null,
-                ImmutableList.of(
-                    new EnvoyProtoData.ClusterWeight("cl21.googleapis.com", 30),
-                    new EnvoyProtoData.ClusterWeight("cl22.googleapis.com", 70)
-                ))));
-    assertThat(routes.get(2)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // prefix match with cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ "/service1/",
-                /* path= */ null),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
-    assertThat(routes.get(3)).isEqualTo(
-        new EnvoyProtoData.Route(
-            // default match with cluster route
-            new io.grpc.xds.RouteMatch(
-                /* prefix= */ "",
-                /* path= */ null),
-            new EnvoyProtoData.RouteAction(
-                TimeUnit.SECONDS.toNanos(15L), "cluster.googleapis.com", null)));
+    assertThat(routes.get(0))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // path match with cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ null,/* pathExactMatch= */ "/service1/method1"),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
+    assertThat(routes.get(1))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // path match with weighted cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ null,/* pathExactMatch= */ "/service2/method2"),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L),
+                    null,
+                    ImmutableList.of(
+                        new EnvoyProtoData.ClusterWeight("cl21.googleapis.com", 30),
+                        new EnvoyProtoData.ClusterWeight("cl22.googleapis.com", 70)))));
+    assertThat(routes.get(2))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // prefix match with cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ "/service1/",/* pathExactMatch= */ null),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L), "cl1.googleapis.com", null)));
+    assertThat(routes.get(3))
+        .isEqualTo(
+            new EnvoyProtoData.Route(
+                // default match with cluster route
+                new io.grpc.xds.RouteMatch(
+                    /* pathPrefixMatch= */ "",/* pathExactMatch= */ null),
+                new EnvoyProtoData.RouteAction(
+                    TimeUnit.SECONDS.toNanos(15L), "cluster.googleapis.com", null)));
   }
 
   /**