Ensure we use a mutable map to persist data