Caching cleanup + touch ui fixes