Gail Badner to complete the thought... the minimal solution I believe for earlier releases would be to split the Map used to cache Region access strategies into multiple maps, one per region type (entity, natural-id, collection). That is what I do on master.