Added caching; much faster