EvictionStrategy adds afterPut in case needed. Refactorings, and 1.6 source bugfixes