Caches n tweaks