More caching added.