Add proxy and caching