Updated to use latest httpcache