Moved redis caching into a seperate class