Fix cache and limit