Refactored async resolver code flow