Improve the way the cache is cleared
Improve consistency