Handled form caching (issue #10)