Should fixed the cache problem