Modified caching time and removed the need for the extra invalidation call. Fixes #17