Remove #cache directive and cache identifiers.  Closes #21