Cache and cmd cleaning

2 wishes :

keep up the good work :-TU