More performance enhancements.
Oeps, wrong selection....
Provide a more efficient eviction strategy
Fix null pointer issue