fixed some caching
merged