Made improvements to remote cache for complex entities
Working model of local cache supporting complex data