Switch this back to using an std::map. DenseMap entries are getting invalidated