Added Cache and Proxy