Issue #2332333 by torgosPizza: Remove the default product entity from the form state just prior to caching