@jeffkaufman @jlporter 
A bit out of scope for this CL, as this applies to the current state as well: 
It looks like we should only do this when we end up instantiating a ProxyFetch right?
Currently, it looks like we are doing this for resource fetches as well, which seems unnecessary to me?