Fixe some issue with the cache.