Initial commit of cache
Modified tests to avoid expected annotation