Added caching to proxy layer