diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs
index 3fd1e543..4ab82b72 100644
--- a/src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs
+++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs
@@ -5,6 +5,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Data.Entity;
 using System.Linq;
@@ -108,7 +109,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Applications).LongCountAsync();
+            return query(Applications).LongCountAsync();
         }
 
         /// <summary>
@@ -169,18 +170,18 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(application));
             }
 
-            Task<TAuthorization[]> ListAuthorizationsAsync()
+            Task<List<TAuthorization>> ListAuthorizationsAsync()
             {
                 return (from authorization in Authorizations.Include(authorization => authorization.Tokens)
                         where authorization.Application.Id.Equals(application.Id)
-                        select authorization).ToArrayAsync(cancellationToken);
+                        select authorization).ToListAsync(cancellationToken);
             }
 
-            Task<TToken[]> ListTokensAsync()
+            Task<List<TToken>> ListTokensAsync()
             {
                 return (from token in Tokens
                         where token.Application.Id.Equals(application.Id)
-                        select token).ToArrayAsync(cancellationToken);
+                        select token).ToListAsync(cancellationToken);
             }
 
             // Remove all the authorizations associated with the application and
@@ -242,7 +243,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Applications).SingleOrDefaultAsync(cancellationToken);
+            return query(Applications).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -262,7 +263,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Applications).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Applications).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs
index fca131b7..2b713ae9 100644
--- a/src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs
+++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs
@@ -5,6 +5,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Data.Entity;
 using System.Linq;
@@ -108,7 +109,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Authorizations).LongCountAsync();
+            return query(Authorizations).LongCountAsync();
         }
 
         /// <summary>
@@ -169,11 +170,11 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(authorization));
             }
 
-            Task<TToken[]> ListTokensAsync()
+            Task<List<TToken>> ListTokensAsync()
             {
                 return (from token in Tokens
                         where token.Application.Id.Equals(authorization.Id)
-                        select token).ToArrayAsync(cancellationToken);
+                        select token).ToListAsync(cancellationToken);
             }
 
             // Remove all the tokens associated with the application.
@@ -255,7 +256,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Authorizations).SingleOrDefaultAsync(cancellationToken);
+            return query(Authorizations).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -275,7 +276,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Authorizations).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Authorizations).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs
index 07e95553..be2047f3 100644
--- a/src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs
+++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs
@@ -89,7 +89,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Scopes).LongCountAsync();
+            return query(Scopes).LongCountAsync();
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Scopes).SingleOrDefaultAsync(cancellationToken);
+            return query(Scopes).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -187,7 +187,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Scopes).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Scopes).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs
index 8ea87721..824afbf1 100644
--- a/src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs
+++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs
@@ -108,7 +108,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Tokens).LongCountAsync();
+            return query(Tokens).LongCountAsync();
         }
 
         /// <summary>
@@ -240,7 +240,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Tokens).SingleOrDefaultAsync(cancellationToken);
+            return query(Tokens).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -292,7 +292,7 @@ namespace OpenIddict.EntityFramework
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Tokens).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Tokens).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs
index 3d7b460c..7b25dc40 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs
@@ -5,6 +5,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -108,7 +109,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Applications).LongCountAsync();
+            return query(Applications).LongCountAsync();
         }
 
         /// <summary>
@@ -169,18 +170,18 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(application));
             }
 
-            Task<TAuthorization[]> ListAuthorizationsAsync()
+            Task<List<TAuthorization>> ListAuthorizationsAsync()
             {
                 return (from authorization in Authorizations.Include(authorization => authorization.Tokens)
                         where authorization.Application.Id.Equals(application.Id)
-                        select authorization).ToArrayAsync(cancellationToken);
+                        select authorization).ToListAsync(cancellationToken);
             }
 
-            Task<TToken[]> ListTokensAsync()
+            Task<List<TToken>> ListTokensAsync()
             {
                 return (from token in Tokens
                         where token.Application.Id.Equals(application.Id)
-                        select token).ToArrayAsync(cancellationToken);
+                        select token).ToListAsync(cancellationToken);
             }
 
             // Remove all the authorizations associated with the application and
@@ -223,7 +224,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Applications).SingleOrDefaultAsync(cancellationToken);
+            return query(Applications).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -243,7 +244,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Applications).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Applications).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs
index fa5ff90d..8aa0fc3e 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs
@@ -5,6 +5,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -108,7 +109,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Authorizations).LongCountAsync();
+            return query(Authorizations).LongCountAsync();
         }
 
         /// <summary>
@@ -169,11 +170,11 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(authorization));
             }
 
-            Task<TToken[]> ListTokensAsync()
+            Task<List<TToken>> ListTokensAsync()
             {
                 return (from token in Tokens
                         where token.Application.Id.Equals(authorization.Id)
-                        select token).ToArrayAsync(cancellationToken);
+                        select token).ToListAsync(cancellationToken);
             }
 
             // Remove all the tokens associated with the application.
@@ -226,7 +227,7 @@ namespace OpenIddict.EntityFrameworkCore
                        select authorization;
             }
 
-            return ImmutableArray.Create(await Query(Authorizations, Applications).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await Query(Authorizations, Applications).ToListAsync(cancellationToken));
         }
 
         /// <summary>
@@ -246,7 +247,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Authorizations).SingleOrDefaultAsync(cancellationToken);
+            return query(Authorizations).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -266,7 +267,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Authorizations).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Authorizations).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs
index 7d5dfa8a..a0083164 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs
@@ -89,7 +89,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Scopes).LongCountAsync();
+            return query(Scopes).LongCountAsync();
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Scopes).SingleOrDefaultAsync(cancellationToken);
+            return query(Scopes).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -187,7 +187,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Scopes).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Scopes).ToListAsync(cancellationToken));
         }
 
         /// <summary>
diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs
index 177c1e1c..f642e975 100644
--- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs
@@ -108,7 +108,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Tokens).LongCountAsync();
+            return query(Tokens).LongCountAsync();
         }
 
         /// <summary>
@@ -203,7 +203,7 @@ namespace OpenIddict.EntityFrameworkCore
                        select token;
             }
 
-            return ImmutableArray.Create(await Query(Applications, Tokens).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await Query(Applications, Tokens).ToListAsync(cancellationToken));
         }
 
         /// <summary>
@@ -237,7 +237,7 @@ namespace OpenIddict.EntityFrameworkCore
                        select token;
             }
 
-            return ImmutableArray.Create(await Query(Authorizations, Tokens).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await Query(Authorizations, Tokens).ToListAsync(cancellationToken));
         }
 
         /// <summary>
@@ -257,7 +257,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query.Invoke(Tokens).SingleOrDefaultAsync(cancellationToken);
+            return query(Tokens).SingleOrDefaultAsync(cancellationToken);
         }
 
         /// <summary>
@@ -277,7 +277,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return ImmutableArray.Create(await query.Invoke(Tokens).ToArrayAsync(cancellationToken));
+            return ImmutableArray.CreateRange(await query(Tokens).ToListAsync(cancellationToken));
         }
 
         /// <summary>