API preloading has been refactored