Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Usually it's `replace` instead of `override`. Though I would personally name the method: `put()`