Cleaned up syntax, added rescue block for cache exception