GROOVY-6191: move away from identity hash map