fix local caching problems