Solve caching problem second time