safer cache cleaning
v2.3.2