Improved modelcache. Uses custom matching for single entity actions.
Merge