Better cache
Fixes, Cache