Fixes for caching and title updates

Let's not keep commented out code in the commits. Easy to forget to clean those up and they tend to become quite confusing when you get back to them in the future :)