Removed unused use statements and added a missing one
Removed some dead code
Fixed tests for cached mapping and add APC on travis to run them