Try to fix the cache issue