small fix
adds embedded classes to cache
Merge branch 'upstream/ValueObjects'