Renamed a couple of methods
Updated the specs a bit
Updated the hard coded cache expiry time and made it more configurable.