Would it make more sense to move this optimization into the `Proxy` call?