Fetching on a cache hit for a resolve is a slightly different story, but splitting that doesn't seem hard to me