Use a LRU list to cleanup the cache.
Avoid a ever-growing cache.
Code cleanup.