--- Zend/PaginatorTest.php	(revision 22312)
+++ Zend/PaginatorTest.php	(working copy)
@@ -997,6 +997,31 @@
 
         $p = new Zend_Paginator(array());
     }
+
+    public function testCacheWithComplexAdapter() {
+        require_once 'Zend/Paginator/_files/Zf6989.php';
+        require_once 'Zend/Paginator/_files/Zf6989_AdapterSource.php';
+
+        $adapterSource1 = new Zf6989_AdapterSource(100);
+        $adapter1 = new Zf6989($adapterSource1);
+        $paginator1 = new Zend_Paginator($adapter1);
+        $paginator1
+            ->setCurrentPageNumber(1)
+            ->setItemCountPerPage(2);
+        $res1 = $paginator1->getCurrentItems();
+
+        $adapterSource2 = $this->getMock('Zf6989_AdapterSource', array('execute'), array(100));
+        $adapterSource2
+            ->expects($this->never())
+            ->method('execute')
+            ->will($this->returnValue(array()));
+        $adapter2 = new Zf6989($adapterSource2);
+        $paginator2 = new Zend_Paginator($adapter2);
+        $paginator2
+            ->setCurrentPageNumber(1)
+            ->setItemCountPerPage(2);
+        $paginator2->getCurrentItems();
+    }
 }
 
 class Zend_Paginator_TestArrayAggregate implements Zend_Paginator_AdapterAggregate
Index: Zend/Paginator/_files/Zf6989.php
===================================================================
--- Zend/Paginator/_files/Zf6989.php	(revision 0)
+++ Zend/Paginator/_files/Zf6989.php	(revision 0)
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Zf4207.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+require_once 'Zend/Paginator/Adapter/Interface.php';
+
+require_once dirname(__FILE__) . '/Zf6989_AdapterSource.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zf6989 implements Zend_Paginator_Adapter_Interface
+{
+    protected $_adapterSource;
+
+    public function __construct(Zf6989_AdapterSource $adapterSource)
+    {
+        $this->_adapterSource = $adapterSource;
+    }
+
+    public function count()
+    {
+        return $this->_adapterSource->count();
+    }
+
+    public function getItems($pageNumber, $itemCountPerPage)
+    {
+        $this->_adapterSource
+            ->setPageNumber($pageNumber)
+            ->setItemsPerPage($itemCountPerPage);
+        return $this->_adapterSource->execute();
+    }
+}
Index: Zend/Paginator/_files/Zf6989_AdapterSource.php
===================================================================
--- Zend/Paginator/_files/Zf6989_AdapterSource.php	(revision 0)
+++ Zend/Paginator/_files/Zf6989_AdapterSource.php	(revision 0)
@@ -0,0 +1,35 @@
+<?php
+class Zf6989_AdapterSource {
+
+    protected $_page;
+
+    protected $_itemsPerPage;
+
+    protected $_count = 0;
+
+    protected $_data;
+
+    public function __construct($num) {
+        $this->_data = range(0, $num);
+    }
+
+    public function setPageNumber($page) {
+        $this->_page = $page;
+        return $this;
+    }
+
+    public function count() {
+        return $this->_count;
+    }
+
+    public function setItemsPerPage($itemsPerPage) {
+        $this->_itemsPerPage = $itemsPerPage;
+        return $this;
+    }
+
+    public function execute() {
+        $this->_count = count($this->_data);
+        return $this->_data;
+    }
+
+}