Add caching to the server handler