Yes the cave in question is 5-Star Cave. The one directly below it, which doesn't have a name, is marked on the maps these days but does get confused with 5-Star Cave. I refer to this one as "Dagga Planter's Cave" - anyone else have a name for it? Either of these 2 is probably better than Shepherds Cave. Last time I used Shepherds Cave was in April last year. It always tends to be a bit dirty (fires and litter), and that time it also had an annoying rotting stench.
Be warned however that all caves on this area (and there are several) get used by the locals, 5-Star Cave included. While 5-Star is out of the way of smugglers, you may, especially at this time of year, find that the shepherds and dagga planter's are occupying it. This is more or less when the dagga harvest starts, so they are bound to be there and you'll probably see the dagga fields.
From Dagga Planter's Cave there is another shelter directly opposite, across the Mbundini river. There are 2 additional caves in the Rwanqa valley, not far from the junction with the Mnweni.