Added specs for cache, be smater about cache items