AUI-1670 Adding prefetching to Surface