Improvements on ConcurrentExpirableHashMap