Fix a caching issue