Fixup cache pool reconfigure now that options are being folded together.

Try to make the code more obvious as well.