#23: Fixed cache paths