Merge "Fix LruCache, allow std:string caching"