Use attributes that are guaranteed to exist in models for generation of cache key
Merge branch 'next' into tabbed_options

* next:
  Use attributes that are guaranteed to exist in models for generation of cache key