Changing Cache to tri-state required more changes, but it's for the better.