Fixed bug for cleanning, cleaning is functional; integrated with cache, functional