Revision 20577

Author:	aaime
Date:	2006-07-17
Message:	Added a couple of caches and changed one statement, tests go down from 2 minutes to 35 seconds :-)