Enable autospec on mock objects
Change the signature of OutputCache.put
Reorganize mock definitions in unit tests