fixed some caching issues