- fix issue where HtmlContent that uses EntityValue as a Key would get cached with the BlockID + EntityValue instead of just the EntityValue.  This was causing HtmlBlocks that share a context key to show stale content instead of the new content when the content was changed.  Fixes #275