Avoid calling the UUID resolver more often than needed