@@ -145,11 +145,11 @@
 
 				if (len > 0)
 					[cache appendCString: buf + last
 						  withLength: len];
 
-				if ([cache length] > 0) {
+				if ([cache cStringLength] > 0) {
 					OFString *str;
 
 					pool = [[OFAutoreleasePool alloc] init];
 					str = transform_string(cache, self);
 					[delegate xmlParser: self
@@ -187,11 +187,11 @@
 				len = i - last;
 				if (len > 0)
 					[cache appendCString: buf + last
 						  withLength: len];
 				cache_c = [cache cString];
-				cache_len = [cache length];
+				cache_len = [cache cStringLength];
 
 				if ((tmp = memchr(cache_c, ':',
 				    cache_len)) != NULL) {
 					name = [[OFString alloc]
 					    initWithCString: tmp + 1
@@ -249,11 +249,11 @@
 				len = i - last;
 				if (len > 0)
 					[cache appendCString: buf + last
 						  withLength: len];
 				cache_c = [cache cString];
-				cache_len = [cache length];
+				cache_len = [cache cStringLength];
 
 				if ((tmp = memchr(cache_c, ':',
 				    cache_len)) != NULL) {
 					name = [[OFString alloc]
 					    initWithCString: tmp + 1
@@ -349,11 +349,11 @@
 				if (len > 0)
 					[cache appendCString: buf + last
 						  withLength: len];
 
 				cache_c = [cache cString];
-				cache_len = [cache length];
+				cache_len = [cache cStringLength];
 
 				if ((tmp = memchr(cache_c, ':',
 				    cache_len)) != NULL ) {
 					attr_name = [[OFString alloc]
 					    initWithCString: tmp + 1
@@ -456,11 +456,11 @@
 			if (buf[i] == '-') {
 				size_t cache_len;
 
 				[cache appendCString: buf + last
 					  withLength: i - last];
-				cache_len = [cache length];
+				cache_len = [cache cStringLength];
 
 				pool = [[OFAutoreleasePool alloc] init];
 				[cache removeCharactersFromIndex: cache_len - 1
 							 toIndex: cache_len];
 				[cache removeLeadingAndTrailingWhitespaces];