Add cache for other method too