Bug fixes
Merge pull request #71 from joshuablake/individual_caching

Bug fixes