fixed some caching issues.