Cache deserialized objects
Renamed methods to be more accurate
Merge branch 'master' into develop

* master:
  Renamed methods to be more accurate
  Cache deserialized objects