Decided it was a bad idea to have apc / memcache under "storage"
Updated file class aswell as tests for class