working on refactoring delete and cache handling
refactored delete and cache handling
finalizing deletion and cache handling of addresses