cache: a few clean-ups to make the code more readable
Authored by: cboos 2010-04-05
Parent: [r9437]
Child: [r9439]