Adding translation, caching, addressing comments