Fix: Should patch/reset async APIs correctly