remove deprecated stuff
abolish address-based cache