diff --git a/PubKeyCache.cpp b/PubKeyCache.cpp
new file mode 100644
index 0000000000..db9a6df9b4
--- /dev/null
+++ b/PubKeyCache.cpp
@@ -0,0 +1,71 @@
+#include "PubKeyCache.h"
+#include "Application.h"
+
+#include "boost/interprocess/sync/scoped_lock.hpp"
+
+
+CKey::pointer PubKeyCache::locate(const uint160& id)
+{
+	if(1)
+	{ // is it in cache
+		boost::mutex::scoped_lock sl(mLock);
+		CKey::pointer ret=mCache[id];
+		if(ret) return ret;
+	}
+
+	std::string sql="SELECT * from PubKeys WHERE ID='";
+	sql.append(id.GetHex());
+	sql.append("';'");
+	std::vector<unsigned char> data;
+	data.reserve(65); // our public keys are actually 33 bytes
+	int pkSize;
+	if(1)
+	{ // is it in the database
+		ScopedLock sl(theApp->getDBLock());
+		Database* db=theApp->getDB();
+		if(!db->executeSQL(sql.c_str())) return CKey::pointer();
+		if(!db->getNextRow()) return CKey::pointer();	
+		pkSize=db->getBinary("PubKey", &(data.front()), data.size());
+	}
+	data.resize(pkSize);
+	CKey::pointer ckp(new CKey());
+	if(!ckp->SetPubKey(data))
+	{
+		assert(false); // bad data in DB
+		return CKey::pointer();
+	}
+	
+	if(1)
+	{ // put it in cache (okay if we race with another retriever)
+		boost::mutex::scoped_lock sl(mLock);
+		mCache[id]=ckp;
+	}
+	return ckp;
+}
+
+void PubKeyCache::store(const uint160& id, CKey::pointer key)
+{
+	if(1)
+	{
+		boost::mutex::scoped_lock sl(mLock);
+		if(mCache[id]) return;
+		mCache[id]=key;
+	}
+	std::string sql="INSERT INTO PubKeys (ID, PubKey) VALUES ('";
+	sql+=id.GetHex();
+	sql+="',";
+
+	std::vector<unsigned char> pk=key->GetPubKey();
+	std::string encodedPK;
+	theApp->getDB()->escape(&(pk.front()), pk.size(), encodedPK);
+	sql+=encodedPK;
+	sql.append(";");
+	ScopedLock sl(theApp->getDBLock());
+	theApp->getDB()->executeSQL(sql.c_str());
+}
+
+void PubKeyCache::clear()
+{
+	boost::mutex::scoped_lock sl(mLock);
+	mCache.empty();
+}
diff --git a/PubKeyCache.h b/PubKeyCache.h
new file mode 100644
index 0000000000..79db370cb8
--- /dev/null
+++ b/PubKeyCache.h
@@ -0,0 +1,25 @@
+#ifndef __PUBKEYCACHE__
+#define __PUBKEYCACHE__
+
+#include <map>
+
+#include "boost/thread/mutex.hpp"
+
+#include "uint256.h"
+#include "key.h"
+
+class PubKeyCache
+{
+private:
+	boost::mutex mLock;
+	std::map<uint160,CKey::pointer> mCache;
+
+public:
+	PubKeyCache() { ; }
+
+	CKey::pointer locate(const uint160& id);
+	void store(const uint160& id, CKey::pointer key);
+	void clear(void);
+};
+
+#endif