Merge branch 'krveduru/cacheFix' into 'master'

Using Expire After Write Strategy for caching

See merge request !87
9 jobs for master in 6 minutes and 57 seconds (queued for 1 second)