CLC-1387 Undo incorrect caching logic
Merge pull request #777 from ctweney/clc-1387-undo

CLC-1387 Undo incorrect caching logic