LPS-47648 Cleanup of unnecessary calls to clearCache