Refactor short-lived entity management into an entity registrar