Added CacheDatabase and CacheDatabaseTest