Fixed bad caching issue