Merge changes from TFS

src/System.Private.Reflection.Core/src/System/Reflection/Runtime/FieldInfos/RuntimeFieldInfo.cs

@@ -89,7 +89,13 @@ public sealed override Type FieldType
         {
             get
             {
-                return this.FieldRuntimeType;
+                Type fieldType = _lazyFieldType;
+                if (fieldType == null)
+                {
+                    _lazyFieldType = fieldType = this.FieldRuntimeType;
+                }
+
+                return fieldType;
             }
         }
 
@@ -292,6 +298,8 @@ protected RuntimeFieldInfo WithDebugName()
 
         private volatile FieldAccessor _lazyFieldAccessor = null;
 
+        private volatile Type _lazyFieldType = null;
+
         private String _debugName;
     }
 }

src/System.Private.Reflection.Core/src/System/Reflection/Runtime/PropertyInfos/RuntimePropertyInfo.cs

@@ -187,8 +187,14 @@ public sealed override Type PropertyType
                     ReflectionTrace.PropertyInfo_PropertyType(this);
 #endif
 
-                TypeContext typeContext = ContextTypeInfo.TypeContext;
-                return PropertyTypeHandle.Resolve(typeContext);
+                Type propertyType = _lazyPropertyType;
+                if (propertyType == null)
+                {
+                    TypeContext typeContext = ContextTypeInfo.TypeContext;
+                    _lazyPropertyType = propertyType = PropertyTypeHandle.Resolve(typeContext);
+                }
+
+                return propertyType;
             }
         }
 
@@ -402,6 +408,8 @@ private object GetConstantValue(bool raw)
 
         private volatile ParameterInfo[] _lazyIndexParameters;
 
+        private volatile Type _lazyPropertyType;
+
         private String _debugName;
     }
 }