Cache check added