Added logo and entity fields caching