Enhance cache UTs for charging addresses