Finished all complex entity support for remote cache