CLC-2934 Remove unused cache settings
Merge pull request #1935 from ctweney/clc-2934

CLC-2934 Remove unused cache settings