Merge branch 'move-getidproperty' into cache-propmaps-issue23

Author: SphtKr

JSONAPI/Core/ModelManager.cs

@@ -48,16 +48,19 @@ public PropertyInfo GetIdProperty(Type type)
 
             var idPropCache = _idProperties.Value;
 
-            if (idPropCache.TryGetValue(type, out idprop)) return idprop;
-            
-            //TODO: Enable attribute-based determination
+            lock (idPropCache)
+            {
+                if (idPropCache.TryGetValue(type, out idprop)) return idprop;
+
+                //TODO: Enable attribute-based determination
 
-            idprop = type.GetProperty("Id");
+                idprop = type.GetProperty("Id");
 
-            if (idprop == null)
-                throw new InvalidOperationException(String.Format("Unable to determine Id property for type {0}", type));
+                if (idprop == null)
+                    throw new InvalidOperationException(String.Format("Unable to determine Id property for type {0}", type));
 
-            _idProperties.Value.Add(type, idprop);
+                idPropCache.Add(type, idprop);
+            }
 
             return idprop;
         }