Cache updates a bit more closely.

May need to be expanded futher.