Enhancements for caching tokens and handling due/start dates/times