Preserve original resource in wait_for