Conflict on TypedEdmStructuredObject when working with multiple models (for API versioning)

System.Web.OData.Formatter.Serialization.TypedEdmStructuredObject has a static cache of "get_" accessors for fast retrieval of properties values. The problem is that the key of the model is a tuple of {PropertyName, CLRType} and this being static is causes overwrites when working with multiple models on the same type in a single process.

Assemblies affected

System.Web.OData.dll

Reproduce steps

1. Create a simple class type "MyEntity" with properties PropertyNew and PropertyOld
2. Have one EDM model, let's say for API 1.0 that maps "Property" to "MyEntity.PropertyOld" and another EDM Model that maps "Property" to "MyEntity.PropertyNew"
3. Perform a get on those 2 API versions routing through the different models.

Expected result

When the request is routed through model "1.0" the value of "Property" should come from PropertyOld and when the request is routed through model "1.1" the value of "Property" should come from PropertyNew.

Actual result

Although the request is routed through the correct models and the serializer and having the correct model reference, the value of the entity "Property" always come to whichever CLR property it was first accessed, despite the model saying otherwise.

Additional details

Root cause is the static cache on System.Web.OData.Formatter.Serialization.TypedEdmStructuredObject which doesn't key it's cache from the model instance, but only property name and CLR type.

Locate System.Web.OData.Formatter.Serialization.TypedEdmStructuredObject in System.Web.OData.dll and inspect its static accessor cache. Reproduce the issue with two EDM models mapping the same property name to different CLR properties, then verify that each API version returns the value selected by its own model.