diff --git a/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs b/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
index 5c6a95500a..2e6559817c 100644
--- a/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
+++ b/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
@@ -34,13 +34,12 @@ namespace Microsoft.AspNetCore.Routing
             _lock = new object();
         }
 
-        public override IChangeToken ChangeToken
+        public override IChangeToken ChangeToken => GetChangeToken();
+
+        public override IChangeToken GetChangeToken()
         {
-            get
-            {
-                EnsureInitialized();
-                return _consumerChangeToken;
-            }
+            EnsureInitialized();
+            return _consumerChangeToken;
         }
 
         public override IReadOnlyList<Endpoint> Endpoints
diff --git a/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs b/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
index 6dfbdbb38c..971f499afa 100644
--- a/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
+++ b/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
@@ -23,7 +23,9 @@ namespace Microsoft.AspNetCore.Routing
             _endpoints.AddRange(endpoints);
         }
 
-        public override IChangeToken ChangeToken { get; } = NullChangeToken.Singleton;
+        public override IChangeToken ChangeToken => GetChangeToken();
+
+        public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
 
         public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
     }
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
index 52ba52dafc..16a04cc587 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
@@ -173,7 +173,8 @@ namespace Microsoft.AspNetCore.Routing
                 _token = new CancellationChangeToken(_cts.Token);
             }
 
-            public override IChangeToken ChangeToken => _token;
+            public override IChangeToken GetChangeToken() => _token;
+            public override IChangeToken ChangeToken => GetChangeToken();
             public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>();
         }
     }
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs b/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
index d434b9c924..79e71babdb 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
@@ -23,7 +23,9 @@ namespace Microsoft.AspNetCore.Routing.TestObjects
             CreateChangeToken();
         }
 
-        public override IChangeToken ChangeToken => _changeToken;
+        public override IChangeToken GetChangeToken() => _changeToken;
+
+        public override IChangeToken ChangeToken => GetChangeToken();
 
         public override IReadOnlyList<Endpoint> Endpoints => _endpoints;