Added caching and scaling content