Temporary: More cache tweaks