Trying to solve caching problem