diff -r 7ff7c6e94fea -r 9a2be90ac9a2 fontservices/fontstore/src/FNTSTD.H
--- a/fontservices/fontstore/src/FNTSTD.H	Thu Apr 01 00:28:03 2010 +0300
+++ b/fontservices/fontstore/src/FNTSTD.H	Wed Apr 14 17:50:37 2010 +0300
@@ -52,7 +52,7 @@
 
 // COpenFontSessionCacheList is placed here rather than openfont.cpp because it is used in fntstore.cpp as well.
 
-class COpenFontSessionCacheListItem;
+class COpenFontSessionCache;
 class COpenFont;
 
 class COpenFontSessionCacheList
@@ -62,20 +62,21 @@
 	{
 public:
 	inline COpenFontSessionCacheList();
+	TInt AddCache(COpenFontSessionCache* aCache);
+	COpenFontSessionCache* FindCache(TInt aSessionHandle) const;
 	void Delete(RHeap* aHeap);
 	void DeleteCache(RHeap* aHeap,TInt aSessionHandle);
-
-	COpenFontSessionCacheListItem* Start();
-	void SetStart(COpenFontSessionCacheListItem* aItem);
-
 	void DeleteFontGlyphs(RHeap* aHeap,const COpenFont* aFont);
-
-	TInt iStartOffset;
+private:
+	enum { EMaxNumCaches = 256 };
+private:
+	TInt iSessionHandleArray[EMaxNumCaches];
+	TInt iCacheOffsetArray[EMaxNumCaches];
 	};
 
-inline COpenFontSessionCacheList::COpenFontSessionCacheList():
-	iStartOffset(0)
+inline COpenFontSessionCacheList::COpenFontSessionCacheList()
 	{
+	Mem::FillZ(this, sizeof(COpenFontSessionCacheList));
 	}
 
 /**