Match addresses case insensitively
Remove caching