Fixed up code analysis and added Update Cache function
Code Analysis