Fix get/put/delete lifecycle