possibly fixed caching problem?