cache tests improved