diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index f55db3ac57..b9a57fcd10 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -32,9 +32,13 @@ namespace Umbraco.Core.Models
             AddContentType(parent);
         }
 
-        public readonly PropertyInfo ContentTypeCompositionSelector =
-            ExpressionHelper.GetPropertyInfo<ContentTypeCompositionBase, IEnumerable<IContentTypeComposition>>(
-                x => x.ContentTypeComposition);
+        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
+
+        private class PropertySelectors
+        {
+            public readonly PropertyInfo ContentTypeCompositionSelector =
+                ExpressionHelper.GetPropertyInfo<ContentTypeCompositionBase, IEnumerable<IContentTypeComposition>>(x => x.ContentTypeComposition);
+        }
 
         /// <summary>
         /// Gets or sets the content types that compose this content type.
@@ -46,7 +50,7 @@ namespace Umbraco.Core.Models
             set
             {
                 _contentTypeComposition = value.ToList();
-                OnPropertyChanged(ContentTypeCompositionSelector);
+                OnPropertyChanged(Ps.Value.ContentTypeCompositionSelector);
             }
         }
 
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 6fd44e2016..6d7cafe7c9 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -52,6 +50,35 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo ValueSelector = ExpressionHelper.GetPropertyInfo<Property, object>(x => x.Value);
             public readonly PropertyInfo VersionSelector = ExpressionHelper.GetPropertyInfo<Property, Guid>(x => x.Version);
         }
+
+        private static readonly DelegateEqualityComparer<object> ValueComparer = new DelegateEqualityComparer<object>(
+            (o, o1) =>
+            {
+                if (o == null && o1 == null) return true;
+
+                //custom comparer for strings.                        
+                if (o is string || o1 is string)
+                {
+                    //if one is null and another is empty then they are the same
+                    if ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace())
+                    {
+                        return true;
+                    }
+                    if (o == null || o1 == null) return false;
+                    return o.Equals(o1);
+                }
+
+                if (o == null || o1 == null) return false;
+
+                //Custom comparer for enumerable if it is enumerable
+                var enum1 = o as IEnumerable;
+                var enum2 = o1 as IEnumerable;
+                if (enum1 != null && enum2 != null)
+                {
+                    return enum1.Cast<object>().UnsortedSequenceEqual(enum2.Cast<object>());
+                }
+                return o.Equals(o1);
+            }, o => o.GetHashCode());
         
         /// <summary>
         /// Returns the instance of the tag support, by default tags are not enabled
@@ -171,35 +198,7 @@ namespace Umbraco.Core.Models
                     }
                 }
 
-                SetPropertyValueAndDetectChanges(value, ref _value, Ps.Value.ValueSelector,
-                    new DelegateEqualityComparer<object>(
-                        (o, o1) =>
-                        {
-                            if (o == null && o1 == null) return true;
-
-                            //custom comparer for strings.                        
-                            if (o is string || o1 is string)
-                            {
-                                //if one is null and another is empty then they are the same
-                                if ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace())
-                                {
-                                    return true;
-                                }
-                                if (o == null || o1 == null) return false;
-                                return o.Equals(o1);
-                            }
-
-                            if (o == null || o1 == null) return false;
-
-                            //Custom comparer for enumerable if it is enumerable
-                            var enum1 = o as IEnumerable;
-                            var enum2 = o1 as IEnumerable;
-                            if (enum1 != null && enum2 != null)
-                            {
-                                return enum1.Cast<object>().UnsortedSequenceEqual(enum2.Cast<object>());
-                            }
-                            return o.Equals(o1);
-                        }, o => o.GetHashCode()));               
+                SetPropertyValueAndDetectChanges(value, ref _value, Ps.Value.ValueSelector, ValueComparer);
             }
         }
 
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs
index 3cc5608620..5dcec8fed0 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs
@@ -54,16 +54,16 @@ namespace Umbraco.Core.Persistence.Factories
                 content.Version = dto.ContentVersionDto.VersionId;
                 content.PublishedState = dto.Published ? PublishedState.Published : PublishedState.Unpublished;
                 content.PublishedVersionGuid = dto.DocumentPublishedReadOnlyDto == null ? default(Guid) : dto.DocumentPublishedReadOnlyDto.VersionId;
+
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                content.ResetDirtyProperties(false);
+                return content;
             }
             finally
             {
                 content.EnableChangeTracking();
             }
-
-            //on initial construction we don't want to have dirty properties tracked
-            // http://issues.umbraco.org/issue/U4-1946
-            content.ResetDirtyProperties(false);
-            return content;
         }
 
         public DocumentDto BuildDto(IContent entity)