Added cache, fixed navigation bug