LPS-47648 Preliminary cleanup of unnecessary calls to clearCache