Remove buggy code and use default cache