minor tweaks to cache addressing.