Firewall against updating of already expired cache entries that have outstanding references
Change blacklist to use simple map
Code review updates
Merge pull request #176 from Metaswitch/issue739sprout

[Reviewer Andy] Issue739sprout