fix the caching problem