Improved cache service (to support html and json fetches)