Fix local caching issue