Fixed bug in enabling/disabling caching.
Merge branch 'test' into dev