Fixed CacheItem issue with DraftEntities having wrong Dictionary Key