caching bugfix