Added ip address caching too