CLC-3160 Eliminate unneeded cache-key methods