CLC-1387 Undo incorrect caching logic