Updating the map of objects was not thread-safe and the units now have
state meaning that it is best to have a new object for each create call.