Solve some caching issues