Fix Logic glitch
Add DOW caching