Don't double-count keys already present.
Provide a No-Op Entity Cache and hook it into DefaultMapper. Fix test to make clear it relies on a real entity cache. Reference issue #61