diff --git a/src/NHibernate/Async/Multi/QueryBatchExtensions.cs b/src/NHibernate/Async/Multi/QueryBatchExtensions.cs
index 5786847c97e..24e5db5fa7c 100644
--- a/src/NHibernate/Async/Multi/QueryBatchExtensions.cs
+++ b/src/NHibernate/Async/Multi/QueryBatchExtensions.cs
@@ -61,6 +61,16 @@ partial class FutureList<TResult> : IFutureList<TResult>
 			}
 		}
 
+		partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
+		{
+
+			public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+				return await (_result.GetValueAsync(cancellationToken)).ConfigureAwait(false);
+			}
+		}
+
 		#endregion Helper classes
 	}
 }
diff --git a/src/NHibernate/Multi/QueryBatchExtensions.cs b/src/NHibernate/Multi/QueryBatchExtensions.cs
index c5405ff9a66..3b10d428265 100644
--- a/src/NHibernate/Multi/QueryBatchExtensions.cs
+++ b/src/NHibernate/Multi/QueryBatchExtensions.cs
@@ -567,7 +567,7 @@ public IList<TResult> Value
 			}
 		}
 
-		class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
+		partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
 		{
 			private readonly IFutureList<TResult> _result;
 
@@ -576,11 +576,6 @@ public FutureEnumerable(IQueryBatch batch, IQueryBatchItem<TResult> query)
 				_result = new FutureList<TResult>(batch, query);
 			}
 
-			public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
-			{
-				return await _result.GetValueAsync(cancellationToken);
-			}
-
 			public IEnumerable<TResult> GetEnumerable()
 			{
 				return _result.Value;