Fix race condition new metric set

[alvarocabanas]

Fix race condition when retrieving an entity at the same time as it's updated