Add some service caching and etag caching