Added caching back to discovery Navigation