Fix wierd issue where cached content is repeated