Added cache feature to Q3 to improve performance
Minor comments