[Fix] Caching wasn't actuallyl working