fix some caching issue