fix caching problem