Plural cache fix
Added cache constants