Cache checker

Smal clear up