Rectify styles being cached permanently in issue 5827