More caching and version bump