moved caching to produciton environment only