Bug 20874: op_resolve does not do any form of caching