No longer using cached metadata. Closes #20