More no-cache tweaks