Fixed cache, updated form, much code