Fixed for the prefetch and flushCache() features