Caching fix

Bug fixes for new release.