Adding cache and improving stop words