Readying the proxy changes for testing

Don't pull this in until proxy is ready, this snapshot currently doesn't have the caching in it, so will fail in a major way.