Added address cache helper class and made use of it in demo