Support resolve hooks that return a thenable (asynchronous resolve). Change second argument to the resolve hook from options to metadata. Reomve comment referring to resolve hook returning an options with an .address property.