Merge "Cache empty prefixs in NameValueCache"