Replace regular expressions with substring
#253 - Lets actually use the cache!