This patch removes to unused cache routines. Please apply.

-Steve