Improving caching layer