Properly update rid when issuing async requests