Better support for cached forms that are being replaced.