Issue 6541 cache issues after folder fixes integrity checker