Caching, Bugfixes