Various Caches and performance fixes