I worked for a dairy for 27 years, this is what I was advised to do.
Whip till it has increased in bulk around 10/15%, pour into ice cube trays, and open freeze.
When it has frozen, pop the cubes into a zip lock bag, squeeze all the air out, and pop back in the freezer till needed.
Some say a little sugar helps too, half a teaspoon to a 10oz pot.