Use cached denominators at a few more places