More caching. Now very fast on iPhone 5