More old cache code cleanup
Cleanup some minor complaints from a lint scan.