Fixes #2324 (maintenance)

Fixes #2324: Refactor map eviction manager code. (Hold references of key-value pairs not Record objects)