Move call back inside cache check