Adding fix for cache = none