Cleaned up back button stuff + caching stuff