Smarter address on-demand fetching