Remaining redesign work: small tweaks, turned caching on.