Backport of PR #589 to 0.9.x
Merge pull request #941 from deniszh/0.9.x_cache_config

Backport of PR #589 to 0.9.x