Adding caching to the server