Fix lazy property caching

Author: maca88

src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs

@@ -36,6 +36,8 @@ protected override string[] Mappings
 			get { return new[] { "LazyProperty.Mappings.hbm.xml" }; }
 		}
 
+		protected override string CacheConcurrencyStrategy => null;
+
 		protected override DebugSessionFactory BuildSessionFactory()
 		{
 			using (var logSpy = new LogSpy(typeof(EntityMetamodel)))
@@ -313,5 +315,35 @@ public async Task CanMergeTransientWithLazyPropertyAsync()
 				Assert.That(book.ALotOfText, Is.EqualTo("a lot of text two..."));
 			}
 		}
+
+		[Test]
+		public async Task CacheShouldNotContainLazyPropertiesAsync()
+		{
+			Book book;
+
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+
+				book = await (s.CreateQuery("from Book b fetch all properties where b.Id = :id")
+				        .SetParameter("id", 1)
+				        .UniqueResultAsync<Book>());
+				await (tx.CommitAsync());
+			}
+
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "ALotOfText"), Is.True);
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "Image"), Is.True);
+
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+
+				book = await (s.GetAsync<Book>(1));
+				await (tx.CommitAsync());
+			}
+
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "ALotOfText"), Is.False);
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "Image"), Is.False);
+		}
 	}
 }

src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs

@@ -23,6 +23,8 @@ protected override string[] Mappings
 			get { return new[] { "LazyProperty.Mappings.hbm.xml" }; }
 		}
 
+		protected override string CacheConcurrencyStrategy => null;
+
 		protected override DebugSessionFactory BuildSessionFactory()
 		{
 			using (var logSpy = new LogSpy(typeof(EntityMetamodel)))
@@ -306,5 +308,35 @@ public void CanMergeTransientWithLazyProperty()
 				Assert.That(book.ALotOfText, Is.EqualTo("a lot of text two..."));
 			}
 		}
+
+		[Test]
+		public void CacheShouldNotContainLazyProperties()
+		{
+			Book book;
+
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+
+				book = s.CreateQuery("from Book b fetch all properties where b.Id = :id")
+				        .SetParameter("id", 1)
+				        .UniqueResult<Book>();
+				tx.Commit();
+			}
+
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "ALotOfText"), Is.True);
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "Image"), Is.True);
+
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+
+				book = s.Get<Book>(1);
+				tx.Commit();
+			}
+
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "ALotOfText"), Is.False);
+			Assert.That(NHibernateUtil.IsPropertyInitialized(book, "Image"), Is.False);
+		}
 	}
 }

src/NHibernate.Test/LazyProperty/Mappings.hbm.xml

@@ -4,6 +4,7 @@
 					namespace="NHibernate.Test.LazyProperty">
 
 	<class name="Book">
+		<cache usage="nonstrict-read-write" include="non-lazy" />
 		<id name="Id">
 			<generator class="assigned" />
 		</id>

src/NHibernate/Async/Cache/Entry/CacheEntry.cs

@@ -29,7 +29,12 @@ public static async Task<CacheEntry> CreateAsync(object[] state, IEntityPersiste
 			return new CacheEntry
 			{
 				//disassembled state gets put in a new array (we write to cache by value!)
-				DisassembledState = await (TypeHelper.DisassembleAsync(state, persister.PropertyTypes, null, session, owner, cancellationToken)).ConfigureAwait(false),
+				DisassembledState = await (TypeHelper.DisassembleAsync(
+					state,
+					persister.PropertyTypes,
+					persister.IsLazyPropertiesCacheable ? null : persister.PropertyLaziness,
+					session,
+					owner, cancellationToken)).ConfigureAwait(false),
 				AreLazyPropertiesUnfetched = unfetched || !persister.IsLazyPropertiesCacheable,
 				Subclass = persister.EntityName,
 				Version = version

src/NHibernate/Cache/Entry/CacheEntry.cs

@@ -40,7 +40,12 @@ public static CacheEntry Create(object[] state, IEntityPersister persister, bool
 			return new CacheEntry
 			{
 				//disassembled state gets put in a new array (we write to cache by value!)
-				DisassembledState = TypeHelper.Disassemble(state, persister.PropertyTypes, null, session, owner),
+				DisassembledState = TypeHelper.Disassemble(
+					state,
+					persister.PropertyTypes,
+					persister.IsLazyPropertiesCacheable ? null : persister.PropertyLaziness,
+					session,
+					owner),
 				AreLazyPropertiesUnfetched = unfetched || !persister.IsLazyPropertiesCacheable,
 				Subclass = persister.EntityName,
 				Version = version

src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs

@@ -268,6 +268,7 @@ private static void BindCache(HbmCache cacheSchema, RootClass rootClass)
 			{
 				rootClass.CacheConcurrencyStrategy = cacheSchema.usage.ToCacheConcurrencyStrategy();
 				rootClass.CacheRegionName = cacheSchema.region;
+				rootClass.SetLazyPropertiesCacheable(cacheSchema.include == HbmCacheInclude.All);
 			}
 		}
 	}