From 56017a340c6f2ce3d8a2cc80fde7dc2e773ee9a7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 2 Mar 2015 16:59:40 +1100
Subject: [PATCH] makes PropertyEditorResolver faster by not having to re-union
 every time its accessed

---
 src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
index 441d7fde2c..90c6e184aa 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
@@ -17,14 +17,17 @@ namespace Umbraco.Core.PropertyEditors
         public PropertyEditorResolver(Func<IEnumerable<Type>> typeListProducerList)
             : base(typeListProducerList, ObjectLifetimeScope.Application)
         {
+            _unioned = new Lazy<List<PropertyEditor>>(() => Values.Union(ManifestBuilder.PropertyEditors).ToList());
         }
 
+        private readonly Lazy<List<PropertyEditor>> _unioned;
+
         /// <summary>
         /// Returns the property editors
         /// </summary>
         public IEnumerable<PropertyEditor> PropertyEditors
         {
-            get { return Values.Union(ManifestBuilder.PropertyEditors); }
+            get { return _unioned.Value; }
         }
 
         /// <summary>