Fixed entity syncing issues related to caching