Introduced before/after specification because we were failing to test cache
Completed cache expiration test