Fix future caching issue and iframe issue