WKS-218 fixing issue with cache on