Added species caching; references #21