Cache constants

simplified cache presets (#389)

* simplified cache presets

* tests

* reinstated, but deprecated, old cache method

* reinstated old tests