Fixed back button and caching problems