Fix for indexerid issues with cache.
Fix for regex matching.