Several fixes for cache clearing and bugfixes