hwaddr-cache refactoring