fixed the cache issue