missing part of last caching-fix