Issue 1486 - [Optimize] More selectable caching