Cleanups and return to cached resolving.