safer to declare the cache global
(although it appears to have been working anyway?)
yeah, that's the way.  there'd be a typo.
Merge remote-tracking branch 'upstream/master'