Readded caching, fixed scopes, version bump