Improved performance of OrderedHashMap