Fix how we compare cached versus saved values