Fix caching issues while going back in the navigation history