Adds language parameter to cache keys
Changes cache function parameters to improve backwards compatibility. Updates cache tests to include language parameter.