Implemented server side caching properly