Moved check for cache option