UPSTREAM: Unwrap CreateOrUpdate in async handler