Fixed client-side caching