some caching
bugfix