fixup! Implement multiple get and put for query cache and query batch

Fix some more troubles, see review on #1718

Author: fredericDelaporte

src/NHibernate/Async/Multi/QueryBatch.cs

@@ -143,6 +143,8 @@ private async Task ExecuteBatchedAsync(CancellationToken cancellationToken)
 					}
 				}
 
+				await (PutCacheableResultsAsync(cancellationToken)).ConfigureAwait(false);
+
 				foreach (var multiSource in _queries)
 				{
 					multiSource.ProcessResults();
@@ -159,8 +161,6 @@ private async Task ExecuteBatchedAsync(CancellationToken cancellationToken)
 					resultSetsCommand.Sql);
 			}
 
-			await (PutCacheableResultsAsync(cancellationToken)).ConfigureAwait(false);
-
 			if (statsEnabled)
 			{
 				stopWatch.Stop();

src/NHibernate/Multi/QueryBatch.cs

@@ -169,6 +169,8 @@ private void ExecuteBatched()
 					}
 				}
 
+				PutCacheableResults();
+
 				foreach (var multiSource in _queries)
 				{
 					multiSource.ProcessResults();
@@ -184,8 +186,6 @@ private void ExecuteBatched()
 					resultSetsCommand.Sql);
 			}
 
-			PutCacheableResults();
-
 			if (statsEnabled)
 			{
 				stopWatch.Stop();

src/NHibernate/Multi/QueryBatchItemBase.cs

@@ -147,7 +147,6 @@ public IEnumerable<Func<DbDataReader, int>> GetResultSetHandler()
 				//Skip processing for items already loaded from cache
 				if (queryInfo.IsResultFromCache)
 				{
-					queryInfo.Result = loader.TransformCacheableResults(queryParameters, queryInfo.CacheKey.ResultTransformer, queryInfo.Result);
 					continue;
 				}
 
@@ -217,11 +216,16 @@ public void ProcessResults()
 
 			for (var i = 0; i < _queryInfos.Count; i++)
 			{
+				var queryInfo = _queryInfos[i];
 				if (_subselectResultKeys[i] != null)
 				{
-					var queryInfo = _queryInfos[i];
 					queryInfo.Loader.CreateSubselects(_subselectResultKeys[i], queryInfo.Parameters, Session);
 				}
+
+				if (queryInfo.IsCacheable)
+					queryInfo.Result =
+						queryInfo.Loader.TransformCacheableResults(
+							queryInfo.Parameters, queryInfo.CacheKey.ResultTransformer, queryInfo.Result);
 			}
 			AfterLoadCallback?.Invoke(GetResults());
 		}