Ceaning code in Cache class