Cache bug fix in avatar and design improvement