Done, I reckon even if caching forms was not necessarily a good idea this PR makes things a bit more robust anyhow.