Add classes to cache
Remove unneeded items
Merge pull request #167 from dlsniper/classes-cache

Add classes to cache