Improve content caching scheme

Cache the loaded values, not the DB representation.
This way we don't need to load the form.
Merge