- Previously we were replicating the same two lines to update a cache
  variable whilst preserving its help string.
- This commit adds a function which wraps up this common operation into
  a single line.

Change-Id: Ic78a5adf5d59262bbbcec1e353ded7620391e862