fixed caching problem