cache_reap() could also use a little love.  Here's a patch to clean it up.

-Matt