Minor fixups to cache stuff.