Fix cache issues
Fix cache issues