fixed caching and version