Bug 915203 - Create token directory lazily