Jamie H - Performance improvement for pre-caching.