Hello,

What I did for the moment:

renamed all the methods from EntityState with the convention of a dictionary (propertyAt: , cacheAt: , 
attributesAt: ). We kept the old ones as deprecated. 

I kept all previous methods as 'deprecated'. So normally, If I did that well, if your code is still using the old entityState API, you should have a 'deprecated' message re-directing you to the new API.