fix caching issue