getMapFor was returning new instances all the time.