diff --git a/eng/Versions.props b/eng/Versions.props
index 23ec4c17bf5..9bb6082b993 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,7 +28,8 @@
     <SQLitePCLRawBundleESqlite3PackageVersion>2.0.2</SQLitePCLRawBundleESqlite3PackageVersion>
     <SQLitePCLRawBundleESqlcipherPackageVersion>2.0.2</SQLitePCLRawBundleESqlcipherPackageVersion>
     <SQLitePCLRawBundleWinsqlite3PackageVersion>2.0.2</SQLitePCLRawBundleWinsqlite3PackageVersion>
-    <SQLitePCLRawCorePackageVersion>2.0.2</SQLitePCLRawCorePackageVersion>
+    <SQLitePCLRawCorePackageVersion>2.0.2</SQLitePCLRawCorePackageVersion>	
+    <IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>
     <StyleCopAnalyzersPackageVersion>1.1.118</StyleCopAnalyzersPackageVersion>
     <BenchmarkDotNetPackageVersion>0.12.0</BenchmarkDotNetPackageVersion>
     <MicrosoftDataSqlClientPackageVersion>2.0.0-preview1.20021.1</MicrosoftDataSqlClientPackageVersion>
diff --git a/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs b/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs
index fe15fbcbb43..181fcab044c 100644
--- a/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs
+++ b/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs
@@ -85,7 +85,7 @@ public virtual EntityTypeBuilder<TEntity> HasBaseType<TBaseType>()
         ///     </para>
         /// </param>
         /// <returns> An object that can be used to configure the primary key. </returns>
-        public virtual KeyBuilder<TEntity> HasKey([NotNull] Expression<Func<TEntity, object>> keyExpression)
+        public virtual KeyBuilder HasKey([NotNull] Expression<Func<TEntity, object>> keyExpression)
             => new KeyBuilder<TEntity>(
                 Builder.PrimaryKey(
                     Check.NotNull(keyExpression, nameof(keyExpression)).GetPropertyAccessList(),
diff --git a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj
index 816f56bb763..e3ab3c41dc7 100644
--- a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj
+++ b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj
@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
   </ItemGroup>
-
 </Project>
diff --git a/test/EFCore.SqlServer.FunctionalTests/IdentityServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/IdentityServerTest.cs
new file mode 100644
index 00000000000..45f08fe53dc
--- /dev/null
+++ b/test/EFCore.SqlServer.FunctionalTests/IdentityServerTest.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using IdentityServer4.EntityFramework.DbContexts;
+using IdentityServer4.EntityFramework.Options;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Xunit;
+
+namespace Microsoft.EntityFrameworkCore
+{
+    public class IdentityServerTest
+    {
+        [ConditionalFact]
+        public void Can_initialize_PersistedGrantDbContext()
+        {
+            using var testDatabase = SqlServerTestStore.CreateInitialized("IdentityServerPersistedGrantDbContext");
+            var options = CreateOptions(testDatabase);
+            using (var context = new PersistedGrantDbContext(options, new OperationalStoreOptions()))
+            {
+                context.Database.EnsureCreatedResiliently();
+            }
+        }
+
+        private DbContextOptions<PersistedGrantDbContext> CreateOptions(TestStore testStore)
+            => (DbContextOptions<PersistedGrantDbContext>)testStore
+                .AddProviderOptions(new DbContextOptionsBuilder(new DbContextOptions<PersistedGrantDbContext>()))
+                .EnableDetailedErrors()
+                .EnableSensitiveDataLogging()
+                .ConfigureWarnings(
+                    b => b.Default(WarningBehavior.Throw)
+                        .Log(CoreEventId.SensitiveDataLoggingEnabledWarning)
+                        .Log(CoreEventId.PossibleUnintendedReferenceComparisonWarning))
+                .Options;
+    }
+}
diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs
index 42c6e2111a5..303670b1bb6 100644
--- a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs
+++ b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs
@@ -182,7 +182,7 @@ public override TestEntityTypeBuilder<TEntity> HasBaseType(string baseEntityType
                 => Wrap(EntityTypeBuilder.HasBaseType(baseEntityTypeName));
 
             public override TestKeyBuilder<TEntity> HasKey(Expression<Func<TEntity, object>> keyExpression)
-                => new GenericTestKeyBuilder<TEntity>(EntityTypeBuilder.HasKey(keyExpression));
+                => new GenericTestKeyBuilder<TEntity>((KeyBuilder<TEntity>)EntityTypeBuilder.HasKey(keyExpression));
 
             public override TestKeyBuilder<TEntity> HasKey(params string[] propertyNames)
                 => new GenericTestKeyBuilder<TEntity>(EntityTypeBuilder.HasKey(propertyNames));