@@ -55,15 +55,13 @@
  *	 override these methods without the lowlevel prefix, you *will* break
  *	 caching and get broken results!
  */
 @interface OFStream: OFObject <OFCopying>
 {
-	char   *_cache;
-	char   *_writeBuffer;
-	size_t _cacheLength, _writeBufferLength;
-	BOOL   _writeBufferEnabled;
-	BOOL   _blocking, _waitingForDelimiter;
+	char *_readBuffer, *_writeBuffer;
+	size_t _readBufferLength, _writeBufferLength;
+	BOOL _writeBufferEnabled, _blocking, _waitingForDelimiter;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (getter=isWriteBufferEnabled) BOOL writeBufferEnabled;
 @property (getter=isBlocking) BOOL blocking;
@@ -982,15 +980,15 @@
  */
 - (size_t)writeFormat: (OFConstantString*)format
 	    arguments: (va_list)arguments;
 
 /*!
- * @brief Returns the number of bytes still present in the internal read cache.
+ * @brief Returns the number of bytes still present in the internal read buffer.
  *
- * @return The number of bytes still present in the internal read cache.
+ * @return The number of bytes still present in the internal read buffer.
  */
-- (size_t)pendingBytes;
+- (size_t)numberOfBytesInReadBuffer;
 
 /*!
  * @brief Returns whether the stream is in blocking mode.
  *
  * @return Whether the stream is in blocking mode